diff --git a/docs/archery/CAN.ics b/docs/archery/CAN.ics
index 6cff21fbf..9d35f09a9 100644
--- a/docs/archery/CAN.ics
+++ b/docs/archery/CAN.ics
@@ -72,6 +72,16 @@ SUMMARY:🏹 Ilfat ABDULLIN 🇰🇿 - 🇨🇦 Eric PETERS
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
+UID:20240730T175500Z-archery-MENS-INDIVIDUAL-116-ELIMINATION-ROUND
+DTSTAMP:20240730T175500Z
+DTSTART:20240730T175500Z
+DTEND:20240730T180800Z
+DESCRIPTION:Archery - Men's Individual 1/16 Elimination Round\n🇨🇦 Eric
+  PETERS
+SUMMARY:🏹 Men's Individual 1/16 Elimination Round
+LOCATION:Invalides
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T164500Z-archery-WOMENS-INDIVIDUAL-132-ELIMINATION-ROUND-CAN-IN
 DTSTAMP:20240801T164500Z
 DTSTART:20240801T164500Z
diff --git a/docs/archery/general.ics b/docs/archery/general.ics
index ae92b79de..28726e2cc 100644
--- a/docs/archery/general.ics
+++ b/docs/archery/general.ics
@@ -535,7 +535,8 @@ UID:20240730T175500Z-archery-MENS-INDIVIDUAL-116-ELIMINATION-ROUND
 DTSTAMP:20240730T175500Z
 DTSTART:20240730T175500Z
 DTEND:20240730T180800Z
-DESCRIPTION:Archery - Men's Individual 1/16 Elimination Round
+DESCRIPTION:Archery - Men's Individual 1/16 Elimination Round\n🇨🇦 Eric
+  PETERS
 SUMMARY:🏹 Men's Individual 1/16 Elimination Round
 LOCATION:Invalides
 END:VEVENT
diff --git a/docs/general/ALB.ics b/docs/general/ALB.ics
index ea5b8f08b..d63889c49 100644
--- a/docs/general/ALB.ics
+++ b/docs/general/ALB.ics
@@ -40,18 +40,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/ALG.ics b/docs/general/ALG.ics
index be4e6f12e..eda4d47a5 100644
--- a/docs/general/ALG.ics
+++ b/docs/general/ALG.ics
@@ -459,10 +459,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 6
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -475,10 +475,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -491,10 +491,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -507,10 +507,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -523,22 +523,6 @@ SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T094749Z-swimming-MENS-200M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240801T094749Z
 DTSTART:20240801T094749Z
@@ -565,10 +549,26 @@ SUMMARY:🥊 Imane KHELIF 🇩🇿 - 🇮🇹 Angela CARINI
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
 DTSTAMP:20240801T135300Z
 DTSTART:20240801T135300Z
 DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -581,10 +581,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -597,10 +597,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -613,10 +613,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T155700Z
+DTSTART:20240801T155700Z
+DTEND:20240801T161800Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -629,10 +629,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T155700Z
-DTSTART:20240801T155700Z
-DTEND:20240801T161800Z
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
diff --git a/docs/general/ANG.ics b/docs/general/ANG.ics
index c91a27cf5..372c27e3f 100644
--- a/docs/general/ANG.ics
+++ b/docs/general/ANG.ics
@@ -123,13 +123,9 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/ANT.ics b/docs/general/ANT.ics
index a27f71826..812729c83 100644
--- a/docs/general/ANT.ics
+++ b/docs/general/ANT.ics
@@ -17,18 +17,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -37,18 +30,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/ARG.ics b/docs/general/ARG.ics
index 890827f8e..8812b91bb 100644
--- a/docs/general/ARG.ics
+++ b/docs/general/ARG.ics
@@ -115,14 +115,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -270,18 +266,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -302,22 +292,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -391,12 +372,9 @@ UID:20240728T191000Z-swimming-WOMENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240728T191000Z
 DTSTART:20240728T191000Z
 DTEND:20240728T192200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇬🇧 Angharad
-  EVANS\n🇮🇹 Benedetta PILATO\n🇪🇪 Eneli JEFIMOVA\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇦🇷 Macarena
-  CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI
-  Satomi\n🇸🇪 Sophie HANSSON\n🇨🇳 TANG Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱
-  Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇦🇷 ARG\n🇨🇳
+  CHN\n🇪🇪 EST\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱
+  NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -865,14 +843,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -897,6 +871,40 @@ SUMMARY:🚣 Lightweight Women's Double Sculls Semifinal A/B 1
 LOCATION:Nautical St - Flat water
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T110000Z-volleyball-MENS-PRELIMINARY-ROUND-POOL-C-JPN-ARG
 DTSTAMP:20240731T110000Z
 DTSTART:20240731T110000Z
@@ -915,10 +923,10 @@ SUMMARY:🏹 Amirkhon SADIKOV 🇺🇿 - 🇦🇷 Mario Damian JAJARABILLA
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -931,10 +939,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -959,92 +967,10 @@ SUMMARY:🚴 Men's Park Final
 LOCATION:La Concorde 2
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1058,10 +984,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1075,20 +1001,35 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 12
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -1110,10 +1051,27 @@ SUMMARY:🏑 ARG 🇦🇷 - 🇮🇪 IRL
 LOCATION:Yves-du-Manoir Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
 DTSTAMP:20240801T130300Z
 DTSTART:20240801T130300Z
 DTEND:20240801T132400Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1127,10 +1085,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1144,10 +1118,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -1160,10 +1134,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1177,10 +1151,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -1193,10 +1167,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1210,10 +1184,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -1226,10 +1200,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1243,22 +1217,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -1276,11 +1234,11 @@ SUMMARY:⛵ Women's Windsurfing - Race 18
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -1288,7 +1246,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -1309,6 +1267,22 @@ SUMMARY:⛵ Women's Windsurfing - Race 19
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/general/ARM.ics b/docs/general/ARM.ics
index 79e10f4c1..1af2e2373 100644
--- a/docs/general/ARM.ics
+++ b/docs/general/ARM.ics
@@ -17,18 +17,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/ARU.ics b/docs/general/ARU.ics
index f45292135..9a9bbe156 100644
--- a/docs/general/ARU.ics
+++ b/docs/general/ARU.ics
@@ -164,10 +164,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 6
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -180,10 +180,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -196,10 +196,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -212,10 +212,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -228,22 +228,6 @@ SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T091841Z-swimming-MENS-50M-FREESTYLE-HEATS
 DTSTAMP:20240801T091841Z
 DTSTART:20240801T091841Z
@@ -276,10 +260,26 @@ SUMMARY:🏊 Men's 50m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
 DTSTAMP:20240801T135300Z
 DTSTART:20240801T135300Z
 DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -292,10 +292,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -308,10 +308,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -324,10 +324,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T155700Z
+DTSTART:20240801T155700Z
+DTEND:20240801T161800Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -340,10 +340,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T155700Z
-DTSTART:20240801T155700Z
-DTEND:20240801T161800Z
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
diff --git a/docs/general/ASA.ics b/docs/general/ASA.ics
index a1117f893..6e445c724 100644
--- a/docs/general/ASA.ics
+++ b/docs/general/ASA.ics
@@ -17,18 +17,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/AUS.ics b/docs/general/AUS.ics
index b1685511a..46863ac08 100644
--- a/docs/general/AUS.ics
+++ b/docs/general/AUS.ics
@@ -203,18 +203,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -223,14 +216,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -239,18 +228,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -259,19 +241,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -318,27 +293,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -347,27 +305,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -614,12 +555,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -652,11 +590,8 @@ UID:20240727T191200Z-swimming-MENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240727T191200Z
 DTSTART:20240727T191200Z
 DTEND:20240727T202600Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇬🇧 Adam
-  PEATY\n🇳🇱 Arno KAMMINGA\n🇦🇹 Bernhard REITSHAMMER\n🇳🇱 Caspar
-  CORBEAU\n🇺🇸 Charlie SWANSON\n🇬🇧 James WILBY\n🇦🇺 Joshua YONG\n🇩🇪
-  Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇩🇪 Melvin IMOUDU\n🇺🇸
-  Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN Haiyang\n🇮🇱 Ron POLONSKY
+DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇳🇱 NED\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -785,16 +720,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -828,12 +757,9 @@ UID:20240728T091500Z-swimming-MENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240728T091500Z
 DTSTART:20240728T091500Z
 DTEND:20240728T092700Z
-DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇮🇹 Alberto
-  RAZZETTI\n🇬🇷 Apostolos PAPASTAMOS\n🇭🇺 Balazs HOLLO\n🇦🇺 Brendon
-  SMITH\n🇺🇸 Carson FOSTER\n🇩🇪 Cedric BUESSING\n🇺🇸 Chase KALISZ\n🇭🇺
-  Gabor ZOMBORI\n🇫🇷 Leon MARCHAND\n🇳🇿 Lewis CLAREBURT\n🇯🇵 MATSUSHITA
-  Tomoyuki\n🇬🇧 Max LITCHFIELD\n🇯🇵 SETO Daiya\n🇨🇦 Tristan
-  JANKOVICS\n🇦🇺 William Campbell PETRIC\n🇨🇳 ZHANG Zhanshuo
+DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇳🇿 NZL\n🇺🇸 USA
 SUMMARY:🏊 Men's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -842,18 +768,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -862,22 +782,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -902,18 +813,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1180,12 +1084,9 @@ UID:20240728T184600Z-swimming-MENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T184600Z
 DTSTART:20240728T184600Z
 DTEND:20240728T190000Z
-DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇮🇹 Alessandro
-  RAGAINI\n🇱🇹 Danas RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧
-  Duncan SCOTT\n🇮🇹 Filippo MEGLI\n🇰🇷 HWANG Sunwoo\n🇰🇷 KIM
-  Woomin\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵
-  MATSUMOTO Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian
-  GIULIANI\n🇩🇪 Rafael MIROSLAW\n🇦🇺 Thomas NEILL
+DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹
+  LTU\n🇷🇴 ROU\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1203,13 +1104,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1350,12 +1247,9 @@ UID:20240729T090000Z-swimming-WOMENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240729T090000Z
 DTSTART:20240729T090000Z
 DTEND:20240729T091200Z
-DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇮🇱
-  Anastasia GORBENKO\n🇷🇸 Anja CREVAR\n🇨🇦 Ella JANSEN\n🇦🇺 Ella
-  RAMSAY\n🇮🇪 Ellen WALSHE\n🇪🇸 Emma CARRASCO CADENS\n🇺🇸 Emma
-  WEYANT\n🇬🇧 Freya Constance COLBERT\n🇦🇺 Jenna FORRESTER\n🇺🇸 Katie
-  GRIMES\n🇬🇧 Katie SHANAHAN\n🇯🇵 NARITA Mio\n🇮🇹 Sara FRANCESCHI\n🇨🇦
-  Summer McINTOSH\n🇯🇵 TANIGAWA Ageha\n🇭🇺 Vivien JACKL
+DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵
+  JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1373,18 +1267,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1393,17 +1280,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1707,12 +1588,9 @@ UID:20240729T190100Z-swimming-WOMENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240729T190100Z
 DTSTART:20240729T190100Z
 DTEND:20240729T191500Z
-DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇫🇷 Beryl
-  GASTALDELLO\n🇪🇸 Carmen WEILER SASTRE\n🇮🇪 Danielle HILL\n🇫🇷 Emma
-  TEREBO\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪
-  Louise HANSSON\n🇳🇱 Maaike de WAARD\n🇺🇸 Regan SMITH\n🇧🇪 Roos
-  VANOTTERDIJK\n🇨🇳 WAN Letian\n🇨🇳 WANG Xueer
+DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇮🇪 IRL\n🇳🇱 NED\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -2565,14 +2443,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -2591,16 +2465,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -2618,13 +2486,9 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -2639,22 +2503,6 @@ SUMMARY:🚣 Women's Quadruple Sculls Final B
 LOCATION:Nautical St - Flat water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T103600Z-boxing-WOMENS-75KG-PRELIMINARIES-ROUND-OF-16-AUS-MEX
 DTSTAMP:20240731T103600Z
 DTSTART:20240731T103600Z
@@ -2664,22 +2512,6 @@ SUMMARY:🥊 Caitlin PARKER 🇦🇺 - 🇲🇽 Citlalli Vanessa ORTIZ
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T111000Z-cycling-bmx-freestyle-WOMENS-PARK-FINAL
 DTSTAMP:20240731T111000Z
 DTSTART:20240731T111000Z
@@ -2701,35 +2533,10 @@ SUMMARY:🏑 AUS 🇦🇺 - 🇺🇸 USA
 LOCATION:Yves-du-Manoir Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120000Z-water-polo-WOMENS-PRELIMINARY-ROUND-GROUP-A-NED-AUS
-DTSTAMP:20240731T120000Z
-DTSTART:20240731T120000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Water Polo - Women's Preliminary Round - Group A
-SUMMARY:🤽 NED 🇳🇱 - 🇦🇺 AUS
-LOCATION:Aquatics Centre
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2742,10 +2549,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2758,6 +2565,30 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T120000Z-water-polo-WOMENS-PRELIMINARY-ROUND-GROUP-A-NED-AUS
+DTSTAMP:20240731T120000Z
+DTSTART:20240731T120000Z
+DTEND:20240731T132500Z
+DESCRIPTION:Water Polo - Women's Preliminary Round - Group A
+SUMMARY:🤽 NED 🇳🇱 - 🇦🇺 AUS
+LOCATION:Aquatics Centre
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
+DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T123600Z-archery-MENS-INDIVIDUAL-132-ELIMINATION-ROUND-KOR-AUS
 DTSTAMP:20240731T123600Z
 DTSTART:20240731T123600Z
@@ -2779,34 +2610,34 @@ SUMMARY:🚴 Men's Park Final
 LOCATION:La Concorde 2
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
   LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
   McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
   FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
   SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 10
+SUMMARY:⛵ Men's Skiff - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2825,37 +2656,6 @@ SUMMARY:🛶 Women's Canoe Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T134600Z-boxing-MENS-57KG-PRELIMINARIES-ROUND-OF-16-BEL-AUS
 DTSTAMP:20240731T134600Z
 DTSTART:20240731T134600Z
@@ -2865,26 +2665,26 @@ SUMMARY:🥊 Vasile USTUROI 🇧🇪 - 🇦🇺 Charlie SENIOR
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
 DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
@@ -2896,6 +2696,54 @@ SUMMARY:⛵ Men's Skiff - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T153000Z-3x3-basketball-WOMENS-POOL-ROUND-GER-AUS
 DTSTAMP:20240731T153000Z
 DTSTART:20240731T153000Z
@@ -3127,11 +2975,11 @@ SUMMARY:🛶 Men's Kayak Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
 DTSTAMP:20240801T135300Z
 DTSTART:20240801T135300Z
 DTEND:20240801T141400Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -3139,7 +2987,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 12
+SUMMARY:⛵ Men's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -3170,10 +3018,26 @@ SUMMARY:🥊 Anna Luca HAMORI 🇭🇺 - 🇦🇺 Marissa WILLIAMSON
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
 DTSTAMP:20240801T142400Z
 DTSTART:20240801T142400Z
 DTEND:20240801T144500Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -3186,10 +3050,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -3202,10 +3066,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T155700Z
+DTSTART:20240801T155700Z
+DTEND:20240801T161800Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -3218,10 +3082,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T155700Z
-DTSTART:20240801T155700Z
-DTEND:20240801T161800Z
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
diff --git a/docs/general/AUT.ics b/docs/general/AUT.ics
index 1398dd41f..d1a79c0b1 100644
--- a/docs/general/AUT.ics
+++ b/docs/general/AUT.ics
@@ -114,18 +114,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -134,19 +127,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -261,11 +247,8 @@ UID:20240727T191200Z-swimming-MENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240727T191200Z
 DTSTART:20240727T191200Z
 DTEND:20240727T202600Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇬🇧 Adam
-  PEATY\n🇳🇱 Arno KAMMINGA\n🇦🇹 Bernhard REITSHAMMER\n🇳🇱 Caspar
-  CORBEAU\n🇺🇸 Charlie SWANSON\n🇬🇧 James WILBY\n🇦🇺 Joshua YONG\n🇩🇪
-  Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇩🇪 Melvin IMOUDU\n🇺🇸
-  Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN Haiyang\n🇮🇱 Ron POLONSKY
+DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇳🇱 NED\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -327,16 +310,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -382,22 +359,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -603,17 +571,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1166,6 +1128,40 @@ SUMMARY:🚣 Lightweight Women's Double Sculls Semifinal A/B 2
 LOCATION:Nautical St - Flat water
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T103900Z-archery-WOMENS-INDIVIDUAL-132-ELIMINATION-ROUND-NED-AU
 DTSTAMP:20240731T103900Z
 DTSTART:20240731T103900Z
@@ -1175,10 +1171,10 @@ SUMMARY:🏹 Quinty ROEFFEN 🇳🇱 - 🇦🇹 Elisabeth STRAKA
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
 DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
@@ -1199,6 +1195,38 @@ SUMMARY:🏓 Bernadette SZOCS 🇷🇴 - 🇦🇹 Sofia POLCANOVA
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T133000Z-canoe-slalom-WOMENS-CANOE-SINGLE-SEMIFINAL
 DTSTAMP:20240731T133000Z
 DTSTART:20240731T133000Z
@@ -1214,91 +1242,10 @@ SUMMARY:🛶 Women's Canoe Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1312,20 +1259,18 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 12
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -1357,11 +1302,11 @@ SUMMARY:🔫 50m Rifle 3 Positions Women's Qualification
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
 DTSTAMP:20240801T130300Z
 DTSTART:20240801T130300Z
 DTEND:20240801T132400Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
+DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
   SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
@@ -1370,7 +1315,7 @@ DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
   TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
   STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 13
+SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -1389,10 +1334,27 @@ SUMMARY:🛶 Men's Kayak Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
 DTSTAMP:20240801T133400Z
 DTSTART:20240801T133400Z
 DTEND:20240801T135500Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 13
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1406,10 +1368,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1423,10 +1385,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1440,10 +1402,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
diff --git a/docs/general/BEL.ics b/docs/general/BEL.ics
index 9abb158f3..6dfd65c3d 100644
--- a/docs/general/BEL.ics
+++ b/docs/general/BEL.ics
@@ -90,18 +90,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -119,14 +112,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -135,19 +124,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -214,12 +196,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -286,16 +265,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -315,18 +288,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -503,12 +469,9 @@ UID:20240728T184600Z-swimming-MENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T184600Z
 DTSTART:20240728T184600Z
 DTEND:20240728T190000Z
-DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇮🇹 Alessandro
-  RAGAINI\n🇱🇹 Danas RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧
-  Duncan SCOTT\n🇮🇹 Filippo MEGLI\n🇰🇷 HWANG Sunwoo\n🇰🇷 KIM
-  Woomin\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵
-  MATSUMOTO Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian
-  GIULIANI\n🇩🇪 Rafael MIROSLAW\n🇦🇺 Thomas NEILL
+DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹
+  LTU\n🇷🇴 ROU\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -517,13 +480,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -591,18 +550,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -611,17 +563,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -797,12 +743,9 @@ UID:20240729T190100Z-swimming-WOMENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240729T190100Z
 DTSTART:20240729T190100Z
 DTEND:20240729T191500Z
-DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇫🇷 Beryl
-  GASTALDELLO\n🇪🇸 Carmen WEILER SASTRE\n🇮🇪 Danielle HILL\n🇫🇷 Emma
-  TEREBO\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪
-  Louise HANSSON\n🇳🇱 Maaike de WAARD\n🇺🇸 Regan SMITH\n🇧🇪 Roos
-  VANOTTERDIJK\n🇨🇳 WAN Letian\n🇨🇳 WANG Xueer
+DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇮🇪 IRL\n🇳🇱 NED\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1070,10 +1013,40 @@ SUMMARY:🚣 Lightweight Men's Double Sculls Semifinal A/B 1
 LOCATION:Nautical St - Flat water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
+DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
 DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
   ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
   BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
@@ -1086,10 +1059,19 @@ SUMMARY:⛵ Women's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
+UID:20240731T134600Z-boxing-MENS-57KG-PRELIMINARIES-ROUND-OF-16-BEL-AUS
+DTSTAMP:20240731T134600Z
+DTSTART:20240731T134600Z
+DTEND:20240731T135700Z
+DESCRIPTION:Boxing - Men's 57kg - Preliminaries - Round of 16
+SUMMARY:🥊 Vasile USTUROI 🇧🇪 - 🇦🇺 Charlie SENIOR
+LOCATION:North Paris Arena
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
 DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
   ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
   BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
@@ -1102,10 +1084,25 @@ SUMMARY:⛵ Women's Skiff - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
 DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
   ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
   BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
@@ -1118,60 +1115,6 @@ SUMMARY:⛵ Women's Skiff - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T134600Z-boxing-MENS-57KG-PRELIMINARIES-ROUND-OF-16-BEL-AUS
-DTSTAMP:20240731T134600Z
-DTSTART:20240731T134600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Boxing - Men's 57kg - Preliminaries - Round of 16
-SUMMARY:🥊 Vasile USTUROI 🇧🇪 - 🇦🇺 Charlie SENIOR
-LOCATION:North Paris Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T150000Z-hockey-WOMENS-POOL-A-BEL-JPN
 DTSTAMP:20240731T150000Z
 DTSTART:20240731T150000Z
diff --git a/docs/general/BEN.ics b/docs/general/BEN.ics
index 140bbacbb..32e519196 100644
--- a/docs/general/BEN.ics
+++ b/docs/general/BEN.ics
@@ -17,22 +17,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/BER.ics b/docs/general/BER.ics
index eff5fac77..39d719685 100644
--- a/docs/general/BER.ics
+++ b/docs/general/BER.ics
@@ -42,22 +42,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -77,18 +68,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/BIH.ics b/docs/general/BIH.ics
index 9a300f9c2..229ca6903 100644
--- a/docs/general/BIH.ics
+++ b/docs/general/BIH.ics
@@ -17,18 +17,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -37,19 +30,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -67,13 +53,9 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/BOT.ics b/docs/general/BOT.ics
index 16d674e5a..f743da388 100644
--- a/docs/general/BOT.ics
+++ b/docs/general/BOT.ics
@@ -17,18 +17,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/BRA.ics b/docs/general/BRA.ics
index 4022bfdd4..56d0dc64a 100644
--- a/docs/general/BRA.ics
+++ b/docs/general/BRA.ics
@@ -209,14 +209,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -225,19 +221,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -255,27 +244,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -284,27 +256,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -614,16 +569,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -675,18 +624,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1011,13 +953,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1101,17 +1039,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -2144,58 +2076,10 @@ SUMMARY:🏊 Men's Individual
 LOCATION:Pont Alexandre III
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2208,10 +2092,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2224,6 +2108,21 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
+DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T124445Z-cycling-bmx-freestyle-MENS-PARK-FINAL
 DTSTAMP:20240731T124445Z
 DTSTART:20240731T124445Z
@@ -2236,34 +2135,34 @@ SUMMARY:🚴 Men's Park Final
 LOCATION:La Concorde 2
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
   LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
   McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
   FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
   SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 10
+SUMMARY:⛵ Men's Skiff - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2282,34 +2181,34 @@ SUMMARY:🛶 Women's Canoe Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
   LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
   McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
   FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
   SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
+SUMMARY:⛵ Men's Skiff - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2331,11 +2230,11 @@ SUMMARY:🥊 Jahmal HARVEY 🇺🇸 - 🇧🇷 Luiz Gabriel OLIVEIRA
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -2343,22 +2242,39 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
+SUMMARY:⛵ Men's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2549,10 +2465,26 @@ SUMMARY:🛶 Men's Kayak Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
 DTSTAMP:20240801T135300Z
 DTSTART:20240801T135300Z
 DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2565,10 +2497,19 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
+UID:20240801T143400Z-boxing-WOMENS-66KG-PRELIMINARIES-ROUND-OF-16-BRA-TPE
+DTSTAMP:20240801T143400Z
+DTSTART:20240801T143400Z
 DTEND:20240801T144500Z
+DESCRIPTION:Boxing - Women's 66kg - Preliminaries - Round of 16
+SUMMARY:🥊 Barbara Maria dos SANTOS 🇧🇷 - 🇹🇼 CHEN Nien Chin
+LOCATION:North Paris Arena
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2581,19 +2522,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143400Z-boxing-WOMENS-66KG-PRELIMINARIES-ROUND-OF-16-BRA-TPE
-DTSTAMP:20240801T143400Z
-DTSTART:20240801T143400Z
-DTEND:20240801T144500Z
-DESCRIPTION:Boxing - Women's 66kg - Preliminaries - Round of 16
-SUMMARY:🥊 Barbara Maria dos SANTOS 🇧🇷 - 🇹🇼 CHEN Nien Chin
-LOCATION:North Paris Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2606,10 +2538,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T155700Z
+DTSTART:20240801T155700Z
+DTEND:20240801T161800Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2622,10 +2554,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T155700Z
-DTSTART:20240801T155700Z
-DTEND:20240801T161800Z
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
diff --git a/docs/general/BRN.ics b/docs/general/BRN.ics
index f1ec828c9..8c285194c 100644
--- a/docs/general/BRN.ics
+++ b/docs/general/BRN.ics
@@ -17,18 +17,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/BRU.ics b/docs/general/BRU.ics
index 3088ef45c..6deefc22b 100644
--- a/docs/general/BRU.ics
+++ b/docs/general/BRU.ics
@@ -17,22 +17,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/BUL.ics b/docs/general/BUL.ics
index 552fe74d9..9f2219eb0 100644
--- a/docs/general/BUL.ics
+++ b/docs/general/BUL.ics
@@ -64,19 +64,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -183,18 +176,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/CAN.ics b/docs/general/CAN.ics
index 3053e4ae1..3745faaa9 100644
--- a/docs/general/CAN.ics
+++ b/docs/general/CAN.ics
@@ -164,18 +164,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -184,14 +177,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -209,27 +198,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -238,27 +210,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -416,12 +371,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -600,12 +552,9 @@ UID:20240728T091500Z-swimming-MENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240728T091500Z
 DTSTART:20240728T091500Z
 DTEND:20240728T092700Z
-DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇮🇹 Alberto
-  RAZZETTI\n🇬🇷 Apostolos PAPASTAMOS\n🇭🇺 Balazs HOLLO\n🇦🇺 Brendon
-  SMITH\n🇺🇸 Carson FOSTER\n🇩🇪 Cedric BUESSING\n🇺🇸 Chase KALISZ\n🇭🇺
-  Gabor ZOMBORI\n🇫🇷 Leon MARCHAND\n🇳🇿 Lewis CLAREBURT\n🇯🇵 MATSUSHITA
-  Tomoyuki\n🇬🇧 Max LITCHFIELD\n🇯🇵 SETO Daiya\n🇨🇦 Tristan
-  JANKOVICS\n🇦🇺 William Campbell PETRIC\n🇨🇳 ZHANG Zhanshuo
+DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇳🇿 NZL\n🇺🇸 USA
 SUMMARY:🏊 Men's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -614,18 +563,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -646,22 +589,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -679,18 +613,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1003,12 +930,9 @@ UID:20240728T193200Z-swimming-MENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240728T193200Z
 DTSTART:20240728T193200Z
 DTEND:20240728T194400Z
-DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇬🇷 Apostolos
-  CHRISTOU\n🇨🇦 Blake TIERNEY\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert
-  KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇬🇧 Jonny
-  MARSHALL\n🇵🇱 Ksawery MASIUK\n🇫🇷 Mewen TOMAC\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇺🇸 Ryan MURPHY\n🇮🇹
-  Thomas CECCON\n🇨🇳 XU Jiayu\n🇫🇷 Yohann NDOYE-BROUARD
+DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹 ITA\n🇵🇱
+  POL\n🇿🇦 RSA\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1017,13 +941,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1137,12 +1057,9 @@ UID:20240729T090000Z-swimming-WOMENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240729T090000Z
 DTSTART:20240729T090000Z
 DTEND:20240729T091200Z
-DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇮🇱
-  Anastasia GORBENKO\n🇷🇸 Anja CREVAR\n🇨🇦 Ella JANSEN\n🇦🇺 Ella
-  RAMSAY\n🇮🇪 Ellen WALSHE\n🇪🇸 Emma CARRASCO CADENS\n🇺🇸 Emma
-  WEYANT\n🇬🇧 Freya Constance COLBERT\n🇦🇺 Jenna FORRESTER\n🇺🇸 Katie
-  GRIMES\n🇬🇧 Katie SHANAHAN\n🇯🇵 NARITA Mio\n🇮🇹 Sara FRANCESCHI\n🇨🇦
-  Summer McINTOSH\n🇯🇵 TANIGAWA Ageha\n🇭🇺 Vivien JACKL
+DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵
+  JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1160,18 +1077,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1565,12 +1475,9 @@ UID:20240729T190100Z-swimming-WOMENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240729T190100Z
 DTSTART:20240729T190100Z
 DTEND:20240729T191500Z
-DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇫🇷 Beryl
-  GASTALDELLO\n🇪🇸 Carmen WEILER SASTRE\n🇮🇪 Danielle HILL\n🇫🇷 Emma
-  TEREBO\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪
-  Louise HANSSON\n🇳🇱 Maaike de WAARD\n🇺🇸 Regan SMITH\n🇧🇪 Roos
-  VANOTTERDIJK\n🇨🇳 WAN Letian\n🇨🇳 WANG Xueer
+DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇮🇪 IRL\n🇳🇱 NED\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -2012,6 +1919,16 @@ SUMMARY:🏉 NZL 🇳🇿 - 🇨🇦 CAN
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
+UID:20240730T175500Z-archery-MENS-INDIVIDUAL-116-ELIMINATION-ROUND
+DTSTAMP:20240730T175500Z
+DTSTART:20240730T175500Z
+DTEND:20240730T180800Z
+DESCRIPTION:Archery - Men's Individual 1/16 Elimination Round\n🇨🇦 Eric
+  PETERS
+SUMMARY:🏹 Men's Individual 1/16 Elimination Round
+LOCATION:Invalides
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T183000Z-swimming-MENS-100M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240730T183000Z
 DTSTART:20240730T183000Z
@@ -2162,14 +2079,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -2178,16 +2091,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -2206,13 +2113,9 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -2226,38 +2129,6 @@ SUMMARY:🏓 Jia Nan YUAN 🇫🇷 - 🇨🇦 Mo ZHANG
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T113000Z-fencing-MENS-SABRE-TEAM-TABLE-OF-8-CAN-KOR
 DTSTAMP:20240731T113000Z
 DTSTART:20240731T113000Z
@@ -2267,19 +2138,18 @@ SUMMARY:🤺 CAN 🇨🇦 - 🇰🇷 KOR
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
+DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2292,18 +2162,34 @@ SUMMARY:🏸 NISHIMOTO Kenta 🇯🇵 - 🇨🇦 Brian YANG
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
   LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
   McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
   FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
   SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 10
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2316,25 +2202,26 @@ SUMMARY:🤽 CAN 🇨🇦 - 🇨🇳 CHN
 LOCATION:Aquatics Centre
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
 DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
@@ -2346,6 +2233,22 @@ SUMMARY:⛵ Men's Skiff - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T150600Z-boxing-WOMENS-75KG-PRELIMINARIES-ROUND-OF-16-CAN-EOR
 DTSTAMP:20240731T150600Z
 DTSTART:20240731T150600Z
diff --git a/docs/general/CHI.ics b/docs/general/CHI.ics
index 40761a133..7217b50aa 100644
--- a/docs/general/CHI.ics
+++ b/docs/general/CHI.ics
@@ -75,19 +75,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/CHN.ics b/docs/general/CHN.ics
index 6719ef7b6..7f3bcb8de 100644
--- a/docs/general/CHN.ics
+++ b/docs/general/CHN.ics
@@ -223,18 +223,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -243,14 +236,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -279,18 +268,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -308,19 +290,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -340,27 +315,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -369,27 +327,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -575,12 +516,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -601,11 +539,8 @@ UID:20240727T191200Z-swimming-MENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240727T191200Z
 DTSTART:20240727T191200Z
 DTEND:20240727T202600Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇬🇧 Adam
-  PEATY\n🇳🇱 Arno KAMMINGA\n🇦🇹 Bernhard REITSHAMMER\n🇳🇱 Caspar
-  CORBEAU\n🇺🇸 Charlie SWANSON\n🇬🇧 James WILBY\n🇦🇺 Joshua YONG\n🇩🇪
-  Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇩🇪 Melvin IMOUDU\n🇺🇸
-  Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN Haiyang\n🇮🇱 Ron POLONSKY
+DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇳🇱 NED\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -808,16 +743,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -851,12 +780,9 @@ UID:20240728T091500Z-swimming-MENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240728T091500Z
 DTSTART:20240728T091500Z
 DTEND:20240728T092700Z
-DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇮🇹 Alberto
-  RAZZETTI\n🇬🇷 Apostolos PAPASTAMOS\n🇭🇺 Balazs HOLLO\n🇦🇺 Brendon
-  SMITH\n🇺🇸 Carson FOSTER\n🇩🇪 Cedric BUESSING\n🇺🇸 Chase KALISZ\n🇭🇺
-  Gabor ZOMBORI\n🇫🇷 Leon MARCHAND\n🇳🇿 Lewis CLAREBURT\n🇯🇵 MATSUSHITA
-  Tomoyuki\n🇬🇧 Max LITCHFIELD\n🇯🇵 SETO Daiya\n🇨🇦 Tristan
-  JANKOVICS\n🇦🇺 William Campbell PETRIC\n🇨🇳 ZHANG Zhanshuo
+DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇳🇿 NZL\n🇺🇸 USA
 SUMMARY:🏊 Men's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -874,18 +800,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -906,22 +826,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -957,18 +868,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1329,12 +1233,9 @@ UID:20240728T191000Z-swimming-WOMENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240728T191000Z
 DTSTART:20240728T191000Z
 DTEND:20240728T192200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇬🇧 Angharad
-  EVANS\n🇮🇹 Benedetta PILATO\n🇪🇪 Eneli JEFIMOVA\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇦🇷 Macarena
-  CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI
-  Satomi\n🇸🇪 Sophie HANSSON\n🇨🇳 TANG Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱
-  Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇦🇷 ARG\n🇨🇳
+  CHN\n🇪🇪 EST\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱
+  NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1343,12 +1244,9 @@ UID:20240728T193200Z-swimming-MENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240728T193200Z
 DTSTART:20240728T193200Z
 DTEND:20240728T194400Z
-DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇬🇷 Apostolos
-  CHRISTOU\n🇨🇦 Blake TIERNEY\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert
-  KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇬🇧 Jonny
-  MARSHALL\n🇵🇱 Ksawery MASIUK\n🇫🇷 Mewen TOMAC\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇺🇸 Ryan MURPHY\n🇮🇹
-  Thomas CECCON\n🇨🇳 XU Jiayu\n🇫🇷 Yohann NDOYE-BROUARD
+DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹 ITA\n🇵🇱
+  POL\n🇿🇦 RSA\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1368,13 +1266,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1537,18 +1431,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1557,17 +1444,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1978,12 +1859,9 @@ UID:20240729T190100Z-swimming-WOMENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240729T190100Z
 DTSTART:20240729T190100Z
 DTEND:20240729T191500Z
-DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇫🇷 Beryl
-  GASTALDELLO\n🇪🇸 Carmen WEILER SASTRE\n🇮🇪 Danielle HILL\n🇫🇷 Emma
-  TEREBO\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪
-  Louise HANSSON\n🇳🇱 Maaike de WAARD\n🇺🇸 Regan SMITH\n🇧🇪 Roos
-  VANOTTERDIJK\n🇨🇳 WAN Letian\n🇨🇳 WANG Xueer
+DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇮🇪 IRL\n🇳🇱 NED\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -2940,14 +2818,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -2965,16 +2839,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -2983,13 +2851,9 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -3021,19 +2885,37 @@ SUMMARY:🏹 Oscar TICAS 🇸🇻 - 🇨🇳 WANG Yan
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -3047,22 +2929,6 @@ SUMMARY:🚣 Women's Quadruple Sculls Final A
 LOCATION:Nautical St - Flat water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T110800Z-boxing-WOMENS-60KG-QUARTERFINAL-CHN-SRB
 DTSTAMP:20240731T110800Z
 DTSTART:20240731T110800Z
@@ -3093,35 +2959,10 @@ SUMMARY:🏀 CHN 🇨🇳 - 🇷🇸 SRB
 LOCATION:Pierre Mauroy Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120000Z-badminton-MENS-DOUBLES-GROUP-PLAY-STAGE-GROUP-D-CHN-TP
-DTSTAMP:20240731T120000Z
-DTSTART:20240731T120000Z
-DTEND:20240731T124000Z
-DESCRIPTION:Badminton - Men's Doubles Group Play Stage - Group D
-SUMMARY:🏸 LIU/OU 🇨🇳 - 🇹🇼 LEE/WANG
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -3134,10 +2975,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -3150,10 +2991,19 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
+UID:20240731T120000Z-badminton-MENS-DOUBLES-GROUP-PLAY-STAGE-GROUP-D-CHN-TP
+DTSTAMP:20240731T120000Z
+DTSTART:20240731T120000Z
+DTEND:20240731T124000Z
+DESCRIPTION:Badminton - Men's Doubles Group Play Stage - Group D
+SUMMARY:🏸 LIU/OU 🇨🇳 - 🇹🇼 LEE/WANG
+LOCATION:La Chapelle Arena
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
 DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
@@ -3165,19 +3015,51 @@ SUMMARY:⛵ Men's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -3205,34 +3087,51 @@ SUMMARY:🤽 CAN 🇨🇦 - 🇨🇳 CHN
 LOCATION:Aquatics Centre
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
   LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
   McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
   FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
   SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
+SUMMARY:⛵ Men's Skiff - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -3245,11 +3144,11 @@ SUMMARY:🏓 Britt EERLAND 🇳🇱 - 🇨🇳 CHEN Meng
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -3257,56 +3156,39 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
+SUMMARY:⛵ Men's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 9
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -3326,23 +3208,6 @@ SUMMARY:🤸 Men's All-Around Final
 LOCATION:Bercy Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T160000Z-3x3-basketball-WOMENS-POOL-ROUND-CAN-CHN
 DTSTAMP:20240731T160000Z
 DTSTART:20240731T160000Z
@@ -3352,40 +3217,6 @@ SUMMARY:🏀 CAN 🇨🇦 - 🇨🇳 CHN
 LOCATION:La Concorde 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T170500Z-3x3-basketball-MENS-POOL-ROUND-SRB-CHN
 DTSTAMP:20240731T170500Z
 DTSTART:20240731T170500Z
@@ -3580,11 +3411,11 @@ SUMMARY:🥊 Stanimira PETROVA 🇧🇬 - 🇨🇳 CHANG Yuan
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
 DTSTAMP:20240801T130300Z
 DTSTART:20240801T130300Z
 DTEND:20240801T132400Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
+DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
   SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
@@ -3593,7 +3424,7 @@ DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
   TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
   STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 13
+SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -3612,10 +3443,43 @@ SUMMARY:🛶 Men's Kayak Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
 DTSTAMP:20240801T133400Z
 DTSTART:20240801T133400Z
 DTEND:20240801T135500Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 13
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -3629,10 +3493,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -3645,10 +3509,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -3662,10 +3526,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -3678,10 +3542,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -3695,10 +3559,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -3711,10 +3575,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -3728,22 +3592,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -3761,11 +3609,11 @@ SUMMARY:⛵ Women's Windsurfing - Race 18
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -3773,7 +3621,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -3812,6 +3660,22 @@ SUMMARY:⛵ Women's Windsurfing - Race 19
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/general/COK.ics b/docs/general/COK.ics
index 1c884dbad..10095ba5c 100644
--- a/docs/general/COK.ics
+++ b/docs/general/COK.ics
@@ -17,18 +17,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/COL.ics b/docs/general/COL.ics
index e18e0875d..3375a212f 100644
--- a/docs/general/COL.ics
+++ b/docs/general/COL.ics
@@ -94,18 +94,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -114,22 +108,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/CRC.ics b/docs/general/CRC.ics
index 6cf93599b..7921833e5 100644
--- a/docs/general/CRC.ics
+++ b/docs/general/CRC.ics
@@ -26,19 +26,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -66,13 +59,9 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/CRO.ics b/docs/general/CRO.ics
index 1d59c219f..3a190d16a 100644
--- a/docs/general/CRO.ics
+++ b/docs/general/CRO.ics
@@ -761,55 +761,10 @@ SUMMARY:🤾 CRO 🇭🇷 - 🇩🇪 GER
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -823,10 +778,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -840,10 +795,40 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
+DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -857,10 +842,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -874,20 +859,18 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 12
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -932,10 +915,27 @@ SUMMARY:🏊 Men's 50m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
 DTSTAMP:20240801T130300Z
 DTSTART:20240801T130300Z
 DTEND:20240801T132400Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -949,10 +949,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -966,10 +966,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -983,10 +983,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1000,10 +1000,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
diff --git a/docs/general/CUB.ics b/docs/general/CUB.ics
index 1ac8c8fed..296602a2d 100644
--- a/docs/general/CUB.ics
+++ b/docs/general/CUB.ics
@@ -158,18 +158,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/CYP.ics b/docs/general/CYP.ics
index 4d7841045..441dd0076 100644
--- a/docs/general/CYP.ics
+++ b/docs/general/CYP.ics
@@ -222,10 +222,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -239,10 +239,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -256,10 +256,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -273,10 +273,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -290,10 +290,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T130300Z
+DTSTART:20240801T130300Z
+DTEND:20240801T132400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -307,10 +307,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T130300Z
-DTSTART:20240801T130300Z
-DTEND:20240801T132400Z
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -324,10 +324,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -341,10 +341,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -358,10 +358,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -375,10 +375,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
diff --git a/docs/general/CZE.ics b/docs/general/CZE.ics
index ce5545269..f19cf05d4 100644
--- a/docs/general/CZE.ics
+++ b/docs/general/CZE.ics
@@ -141,18 +141,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -276,12 +269,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -397,18 +387,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -417,22 +401,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -452,18 +427,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -674,12 +642,9 @@ UID:20240728T193200Z-swimming-MENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240728T193200Z
 DTSTART:20240728T193200Z
 DTEND:20240728T194400Z
-DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇬🇷 Apostolos
-  CHRISTOU\n🇨🇦 Blake TIERNEY\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert
-  KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇬🇧 Jonny
-  MARSHALL\n🇵🇱 Ksawery MASIUK\n🇫🇷 Mewen TOMAC\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇺🇸 Ryan MURPHY\n🇮🇹
-  Thomas CECCON\n🇨🇳 XU Jiayu\n🇫🇷 Yohann NDOYE-BROUARD
+DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹 ITA\n🇵🇱
+  POL\n🇿🇦 RSA\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -688,13 +653,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1449,14 +1410,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1471,35 +1428,37 @@ SUMMARY:🚣 Lightweight Men's Double Sculls Semifinal A/B 1
 LOCATION:Nautical St - Flat water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -1515,22 +1474,6 @@ SUMMARY:🚴 Women's Park Final
 LOCATION:La Concorde 2
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T130200Z-archery-WOMENS-INDIVIDUAL-132-ELIMINATION-ROUND-CZE-UZ
 DTSTAMP:20240731T130200Z
 DTSTART:20240731T130200Z
@@ -1540,6 +1483,39 @@ SUMMARY:🏹 Marie HORACKOVA 🇨🇿 - 🇺🇿 Ziyodakhon ABDUSATTOROVA
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T133000Z-canoe-slalom-WOMENS-CANOE-SINGLE-SEMIFINAL
 DTSTAMP:20240731T133000Z
 DTSTART:20240731T133000Z
@@ -1564,61 +1540,10 @@ SUMMARY:🏸 Gregoria Mariska TUNJUNG 🇮🇩 - 🇨🇿 Tereza SVABIKOVA
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1632,20 +1557,35 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 12
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -1668,11 +1608,11 @@ SUMMARY:🔫 50m Rifle 3 Positions Women's Qualification
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
 DTSTAMP:20240801T130300Z
 DTSTART:20240801T130300Z
 DTEND:20240801T132400Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
+DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
   SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
@@ -1681,7 +1621,7 @@ DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
   TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
   STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 13
+SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -1700,10 +1640,27 @@ SUMMARY:🛶 Men's Kayak Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
 DTSTAMP:20240801T133400Z
 DTSTART:20240801T133400Z
 DTEND:20240801T135500Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 13
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1717,10 +1674,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1734,10 +1691,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1751,10 +1708,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
diff --git a/docs/general/DEN.ics b/docs/general/DEN.ics
index 4fb7a9098..015a5e3ce 100644
--- a/docs/general/DEN.ics
+++ b/docs/general/DEN.ics
@@ -100,18 +100,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -120,27 +113,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1015,14 +991,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1040,69 +1012,17 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -1115,10 +1035,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -1131,10 +1051,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
 DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
@@ -1146,42 +1066,10 @@ SUMMARY:⛵ Men's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
 DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
@@ -1193,11 +1081,58 @@ SUMMARY:⛵ Men's Skiff - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -1205,7 +1140,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
+SUMMARY:⛵ Men's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -1227,18 +1162,35 @@ SUMMARY:🥊 Makan TRAORE 🇫🇷 - 🇩🇰 Nikolai TERTERYAN
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -1298,10 +1250,26 @@ SUMMARY:🔫 50m Rifle 3 Positions Women's Qualification
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
 DTSTAMP:20240801T135300Z
 DTSTART:20240801T135300Z
 DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -1314,10 +1282,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -1330,10 +1298,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -1346,10 +1314,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T155700Z
+DTSTART:20240801T155700Z
+DTEND:20240801T161800Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -1362,10 +1330,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T155700Z
-DTSTART:20240801T155700Z
-DTEND:20240801T161800Z
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
diff --git a/docs/general/DOM.ics b/docs/general/DOM.ics
index 52a69fcc3..687d5a745 100644
--- a/docs/general/DOM.ics
+++ b/docs/general/DOM.ics
@@ -81,18 +81,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/EGY.ics b/docs/general/EGY.ics
index 0a0481c66..91c6aaf35 100644
--- a/docs/general/EGY.ics
+++ b/docs/general/EGY.ics
@@ -413,18 +413,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -543,17 +536,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/ESA.ics b/docs/general/ESA.ics
index 5bd827b62..46277eda7 100644
--- a/docs/general/ESA.ics
+++ b/docs/general/ESA.ics
@@ -99,18 +99,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/ESP.ics b/docs/general/ESP.ics
index 9490e1ad8..959e0dd52 100644
--- a/docs/general/ESP.ics
+++ b/docs/general/ESP.ics
@@ -173,18 +173,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -249,27 +242,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -589,18 +565,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -609,22 +579,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -917,12 +878,9 @@ UID:20240728T193200Z-swimming-MENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240728T193200Z
 DTSTART:20240728T193200Z
 DTEND:20240728T194400Z
-DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇬🇷 Apostolos
-  CHRISTOU\n🇨🇦 Blake TIERNEY\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert
-  KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇬🇧 Jonny
-  MARSHALL\n🇵🇱 Ksawery MASIUK\n🇫🇷 Mewen TOMAC\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇺🇸 Ryan MURPHY\n🇮🇹
-  Thomas CECCON\n🇨🇳 XU Jiayu\n🇫🇷 Yohann NDOYE-BROUARD
+DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹 ITA\n🇵🇱
+  POL\n🇿🇦 RSA\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1033,12 +991,9 @@ UID:20240729T090000Z-swimming-WOMENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240729T090000Z
 DTSTART:20240729T090000Z
 DTEND:20240729T091200Z
-DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇮🇱
-  Anastasia GORBENKO\n🇷🇸 Anja CREVAR\n🇨🇦 Ella JANSEN\n🇦🇺 Ella
-  RAMSAY\n🇮🇪 Ellen WALSHE\n🇪🇸 Emma CARRASCO CADENS\n🇺🇸 Emma
-  WEYANT\n🇬🇧 Freya Constance COLBERT\n🇦🇺 Jenna FORRESTER\n🇺🇸 Katie
-  GRIMES\n🇬🇧 Katie SHANAHAN\n🇯🇵 NARITA Mio\n🇮🇹 Sara FRANCESCHI\n🇨🇦
-  Summer McINTOSH\n🇯🇵 TANIGAWA Ageha\n🇭🇺 Vivien JACKL
+DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵
+  JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1056,18 +1011,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1076,17 +1024,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1403,12 +1345,9 @@ UID:20240729T190100Z-swimming-WOMENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240729T190100Z
 DTSTART:20240729T190100Z
 DTEND:20240729T191500Z
-DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇫🇷 Beryl
-  GASTALDELLO\n🇪🇸 Carmen WEILER SASTRE\n🇮🇪 Danielle HILL\n🇫🇷 Emma
-  TEREBO\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪
-  Louise HANSSON\n🇳🇱 Maaike de WAARD\n🇺🇸 Regan SMITH\n🇧🇪 Roos
-  VANOTTERDIJK\n🇨🇳 WAN Letian\n🇨🇳 WANG Xueer
+DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇮🇪 IRL\n🇳🇱 NED\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -2174,14 +2113,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -2209,16 +2144,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -2237,62 +2166,76 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 7
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2314,35 +2257,18 @@ SUMMARY:🤾 ESP 🇪🇸 - 🇯🇵 JPN
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 7
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 8
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
+DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2355,34 +2281,51 @@ SUMMARY:🏸 Zii Jia LEE 🇲🇾 - 🇪🇸 Pablo ABIAN
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
   LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
   McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
   FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
   SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 10
+SUMMARY:⛵ Men's Skiff - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2401,57 +2344,43 @@ SUMMARY:🛶 Women's Canoe Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
 DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
@@ -2463,20 +2392,51 @@ SUMMARY:⛵ Men's Skiff - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 8
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2498,57 +2458,6 @@ SUMMARY:⚽ BRA 🇧🇷 - 🇪🇸 ESP
 LOCATION:Bordeaux Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T162400Z-archery-WOMENS-INDIVIDUAL-132-ELIMINATION-ROUND-GBR-ES
 DTSTAMP:20240731T162400Z
 DTSTART:20240731T162400Z
@@ -2558,23 +2467,6 @@ SUMMARY:🏹 Megs HAVERS 🇬🇧 - 🇪🇸 Elia CANALES
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T174500Z-hockey-MENS-POOL-A-ESP-RSA
 DTSTAMP:20240731T174500Z
 DTSTART:20240731T174500Z
@@ -2694,11 +2586,11 @@ SUMMARY:🤾 ESP 🇪🇸 - 🇭🇺 HUN
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
 DTSTAMP:20240801T130300Z
 DTSTART:20240801T130300Z
 DTEND:20240801T132400Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
+DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
   SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
@@ -2707,7 +2599,7 @@ DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
   TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
   STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 13
+SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2726,10 +2618,43 @@ SUMMARY:🛶 Men's Kayak Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
 DTSTAMP:20240801T133400Z
 DTSTART:20240801T133400Z
 DTEND:20240801T135500Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 13
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -2743,10 +2668,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2759,10 +2684,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -2776,10 +2701,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2792,10 +2717,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -2809,10 +2734,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2825,10 +2750,19 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153000Z-hockey-WOMENS-POOL-B-ESP-RSA
+DTSTAMP:20240801T153000Z
+DTSTART:20240801T153000Z
+DTEND:20240801T170000Z
+DESCRIPTION:Hockey - Women's Pool B
+SUMMARY:🏑 ESP 🇪🇸 - 🇿🇦 RSA
+LOCATION:Yves-du-Manoir Stadium
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -2842,31 +2776,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240801T153000Z-hockey-WOMENS-POOL-B-ESP-RSA
-DTSTAMP:20240801T153000Z
-DTSTART:20240801T153000Z
-DTEND:20240801T170000Z
-DESCRIPTION:Hockey - Women's Pool B
-SUMMARY:🏑 ESP 🇪🇸 - 🇿🇦 RSA
-LOCATION:Yves-du-Manoir Stadium
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -2884,11 +2793,11 @@ SUMMARY:⛵ Women's Windsurfing - Race 18
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -2896,7 +2805,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2926,6 +2835,22 @@ SUMMARY:⛵ Women's Windsurfing - Race 19
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/general/EST.ics b/docs/general/EST.ics
index 6a3d409cd..bfde0b0e4 100644
--- a/docs/general/EST.ics
+++ b/docs/general/EST.ics
@@ -56,19 +56,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -123,18 +116,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -164,12 +151,9 @@ UID:20240728T191000Z-swimming-WOMENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240728T191000Z
 DTSTART:20240728T191000Z
 DTEND:20240728T192200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇬🇧 Angharad
-  EVANS\n🇮🇹 Benedetta PILATO\n🇪🇪 Eneli JEFIMOVA\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇦🇷 Macarena
-  CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI
-  Satomi\n🇸🇪 Sophie HANSSON\n🇨🇳 TANG Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱
-  Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇦🇷 ARG\n🇨🇳
+  CHN\n🇪🇪 EST\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱
+  NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -377,14 +361,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -399,19 +379,10 @@ SUMMARY:🚣 Men's Quadruple Sculls Final B
 LOCATION:Nautical St - Flat water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T102600Z-archery-WOMENS-INDIVIDUAL-132-ELIMINATION-ROUND-IND-ES
-DTSTAMP:20240731T102600Z
-DTSTART:20240731T102600Z
-DTEND:20240731T103900Z
-DESCRIPTION:Archery - Women's Individual 1/32 Elimination Round
-SUMMARY:🏹 Deepika KUMARI 🇮🇳 - 🇪🇪 Reena PARNAT
-LOCATION:Invalides
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -425,10 +396,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -442,10 +413,19 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T102600Z-archery-WOMENS-INDIVIDUAL-132-ELIMINATION-ROUND-IND-ES
+DTSTAMP:20240731T102600Z
+DTSTART:20240731T102600Z
+DTEND:20240731T103900Z
+DESCRIPTION:Archery - Women's Individual 1/32 Elimination Round
+SUMMARY:🏹 Deepika KUMARI 🇮🇳 - 🇪🇪 Reena PARNAT
+LOCATION:Invalides
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -459,10 +439,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -476,10 +456,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T130300Z
+DTSTART:20240801T130300Z
+DTEND:20240801T132400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -493,10 +473,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T130300Z
-DTSTART:20240801T130300Z
-DTEND:20240801T132400Z
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -510,10 +490,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -527,10 +507,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -544,10 +524,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -561,10 +541,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
diff --git a/docs/general/FIN.ics b/docs/general/FIN.ics
index efda2653a..2f699dd3c 100644
--- a/docs/general/FIN.ics
+++ b/docs/general/FIN.ics
@@ -168,18 +168,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -569,58 +563,10 @@ SUMMARY:🏸 Kunlavut VITIDSARN 🇹🇭 - 🇫🇮 Kalle KOLJONEN
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -633,10 +579,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -649,10 +595,42 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -665,10 +643,26 @@ SUMMARY:⛵ Men's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -681,10 +675,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -697,10 +691,19 @@ SUMMARY:⛵ Men's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T140200Z-boxing-WOMENS-50KG-PRELIMINARIES-ROUND-OF-16-FIN-USA
+DTSTAMP:20240801T140200Z
+DTSTART:20240801T140200Z
+DTEND:20240801T141300Z
+DESCRIPTION:Boxing - Women's 50kg - Preliminaries - Round of 16
+SUMMARY:🥊 Pihla KAIVO-OJA 🇫🇮 - 🇺🇸 Jennifer LOZANO
+LOCATION:North Paris Arena
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -713,19 +716,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140200Z-boxing-WOMENS-50KG-PRELIMINARIES-ROUND-OF-16-FIN-USA
-DTSTAMP:20240801T140200Z
-DTSTART:20240801T140200Z
-DTEND:20240801T141300Z
-DESCRIPTION:Boxing - Women's 50kg - Preliminaries - Round of 16
-SUMMARY:🥊 Pihla KAIVO-OJA 🇫🇮 - 🇺🇸 Jennifer LOZANO
-LOCATION:North Paris Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -738,10 +732,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -754,10 +748,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T155700Z
+DTSTART:20240801T155700Z
+DTEND:20240801T161800Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -770,10 +764,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T155700Z
-DTSTART:20240801T155700Z
-DTEND:20240801T161800Z
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
diff --git a/docs/general/FRA.ics b/docs/general/FRA.ics
index c92a84b11..5647dc73d 100644
--- a/docs/general/FRA.ics
+++ b/docs/general/FRA.ics
@@ -234,18 +234,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -254,14 +247,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -299,19 +288,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -376,27 +358,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -414,27 +379,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -796,12 +744,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1038,12 +983,9 @@ UID:20240728T091500Z-swimming-MENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240728T091500Z
 DTSTART:20240728T091500Z
 DTEND:20240728T092700Z
-DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇮🇹 Alberto
-  RAZZETTI\n🇬🇷 Apostolos PAPASTAMOS\n🇭🇺 Balazs HOLLO\n🇦🇺 Brendon
-  SMITH\n🇺🇸 Carson FOSTER\n🇩🇪 Cedric BUESSING\n🇺🇸 Chase KALISZ\n🇭🇺
-  Gabor ZOMBORI\n🇫🇷 Leon MARCHAND\n🇳🇿 Lewis CLAREBURT\n🇯🇵 MATSUSHITA
-  Tomoyuki\n🇬🇧 Max LITCHFIELD\n🇯🇵 SETO Daiya\n🇨🇦 Tristan
-  JANKOVICS\n🇦🇺 William Campbell PETRIC\n🇨🇳 ZHANG Zhanshuo
+DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇳🇿 NZL\n🇺🇸 USA
 SUMMARY:🏊 Men's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1091,22 +1033,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1622,12 +1555,9 @@ UID:20240728T193200Z-swimming-MENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240728T193200Z
 DTSTART:20240728T193200Z
 DTEND:20240728T194400Z
-DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇬🇷 Apostolos
-  CHRISTOU\n🇨🇦 Blake TIERNEY\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert
-  KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇬🇧 Jonny
-  MARSHALL\n🇵🇱 Ksawery MASIUK\n🇫🇷 Mewen TOMAC\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇺🇸 Ryan MURPHY\n🇮🇹
-  Thomas CECCON\n🇨🇳 XU Jiayu\n🇫🇷 Yohann NDOYE-BROUARD
+DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹 ITA\n🇵🇱
+  POL\n🇿🇦 RSA\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1819,18 +1749,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1857,17 +1780,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -2514,12 +2431,9 @@ UID:20240729T190100Z-swimming-WOMENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240729T190100Z
 DTSTART:20240729T190100Z
 DTEND:20240729T191500Z
-DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇫🇷 Beryl
-  GASTALDELLO\n🇪🇸 Carmen WEILER SASTRE\n🇮🇪 Danielle HILL\n🇫🇷 Emma
-  TEREBO\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪
-  Louise HANSSON\n🇳🇱 Maaike de WAARD\n🇺🇸 Regan SMITH\n🇧🇪 Roos
-  VANOTTERDIJK\n🇨🇳 WAN Letian\n🇨🇳 WANG Xueer
+DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇮🇪 IRL\n🇳🇱 NED\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -3651,16 +3565,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -3694,19 +3602,37 @@ SUMMARY:🏓 Jia Nan YUAN 🇫🇷 - 🇨🇦 Mo ZHANG
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -3719,22 +3645,6 @@ SUMMARY:🏑 FRA 🇫🇷 - 🇩🇪 GER
 LOCATION:Yves-du-Manoir Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T111000Z-cycling-bmx-freestyle-WOMENS-PARK-FINAL
 DTSTAMP:20240731T111000Z
 DTSTART:20240731T111000Z
@@ -3756,26 +3666,10 @@ SUMMARY:🤺 FRA 🇫🇷 - 🇪🇬 EGY
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -3788,10 +3682,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -3804,6 +3698,21 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
+DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T124445Z-cycling-bmx-freestyle-MENS-PARK-FINAL
 DTSTAMP:20240731T124445Z
 DTSTART:20240731T124445Z
@@ -3816,21 +3725,6 @@ SUMMARY:🚴 Men's Park Final
 LOCATION:La Concorde 2
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T130000Z-beach-volleyball-WOMENS-PRELIMINARY-PHASE-POOL-C-USA-F
 DTSTAMP:20240731T130000Z
 DTSTART:20240731T130000Z
@@ -3849,19 +3743,51 @@ SUMMARY:🏓 Felix LEBRUN 🇫🇷 - 🇩🇪 Dimitrij OVTCHAROV
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -3880,34 +3806,51 @@ SUMMARY:🛶 Women's Canoe Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
   LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
   McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
   FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
   SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
+SUMMARY:⛵ Men's Skiff - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -3920,11 +3863,11 @@ SUMMARY:🏓 Alexis LEBRUN 🇫🇷 - 🇧🇷 Hugo CALDERANO
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -3932,7 +3875,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
+SUMMARY:⛵ Men's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -3954,35 +3897,35 @@ SUMMARY:🥊 Makan TRAORE 🇫🇷 - 🇩🇰 Nikolai TERTERYAN
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 8
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -3995,23 +3938,6 @@ SUMMARY:🏐 PLACETTE/RICHARD 🇫🇷 - 🇪🇸 ALVAREZ M/MORENO
 LOCATION:Eiffel Tower Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T152200Z-boxing-WOMENS-75KG-PRELIMINARIES-ROUND-OF-16-THA-FRA
 DTSTAMP:20240731T152200Z
 DTSTART:20240731T152200Z
@@ -4030,23 +3956,6 @@ SUMMARY:🏹 Jean-Charles VALLADONT 🇫🇷 - 🇬🇧 Conor HALL
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T161100Z-archery-WOMENS-INDIVIDUAL-132-ELIMINATION-ROUND-FRA-SV
 DTSTAMP:20240731T161100Z
 DTSTART:20240731T161100Z
@@ -4056,40 +3965,6 @@ SUMMARY:🏹 Amelie CORDEAU 🇫🇷 - 🇸🇰 Denisa BARANKOVA
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T170000Z-handball-MENS-PRELIMINARY-ROUND-GROUP-B-FRA-EGY
 DTSTAMP:20240731T170000Z
 DTSTART:20240731T170000Z
@@ -4308,11 +4183,11 @@ SUMMARY:🤽 FRA 🇫🇷 - 🇦🇺 AUS
 LOCATION:Aquatics Centre
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
 DTSTAMP:20240801T130300Z
 DTSTART:20240801T130300Z
 DTEND:20240801T132400Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
+DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
   SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
@@ -4321,7 +4196,7 @@ DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
   TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
   STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 13
+SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -4340,11 +4215,11 @@ SUMMARY:🛶 Men's Kayak Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
 DTSTAMP:20240801T133400Z
 DTSTART:20240801T133400Z
 DTEND:20240801T135500Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
+DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
   SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
@@ -4353,15 +4228,15 @@ DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
   TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
   STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 14
+SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
 DTSTAMP:20240801T135300Z
 DTSTART:20240801T135300Z
 DTEND:20240801T141400Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -4369,7 +4244,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 12
+SUMMARY:⛵ Men's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -4391,10 +4266,43 @@ SUMMARY:🤾 ANG 🇦🇴 - 🇫🇷 FRA
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
 DTSTAMP:20240801T140500Z
 DTSTART:20240801T140500Z
 DTEND:20240801T142600Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 14
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -4408,10 +4316,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -4424,10 +4332,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -4441,10 +4349,19 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T151500Z-basketball-WOMENS-GROUP-PHASE-GROUP-B-FRA-NGR
+DTSTAMP:20240801T151500Z
+DTSTART:20240801T151500Z
+DTEND:20240801T170000Z
+DESCRIPTION:Basketball - Women's Group Phase - Group B
+SUMMARY:🏀 FRA 🇫🇷 - 🇳🇬 NGR
+LOCATION:Pierre Mauroy Stadium
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -4457,10 +4374,19 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-boxing-MENS-635KG-QUARTERFINAL-HUN-FRA
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T154900Z
+DESCRIPTION:Boxing - Men's 63.5kg - Quarterfinal
+SUMMARY:🥊 Richard KOVACS 🇭🇺 - 🇫🇷 Sofiane OUMIHA
+LOCATION:North Paris Arena
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -4474,40 +4400,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T151500Z-basketball-WOMENS-GROUP-PHASE-GROUP-B-FRA-NGR
-DTSTAMP:20240801T151500Z
-DTSTART:20240801T151500Z
-DTEND:20240801T170000Z
-DESCRIPTION:Basketball - Women's Group Phase - Group B
-SUMMARY:🏀 FRA 🇫🇷 - 🇳🇬 NGR
-LOCATION:Pierre Mauroy Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240801T153800Z-boxing-MENS-635KG-QUARTERFINAL-HUN-FRA
-DTSTAMP:20240801T153800Z
-DTSTART:20240801T153800Z
-DTEND:20240801T154900Z
-DESCRIPTION:Boxing - Men's 63.5kg - Quarterfinal
-SUMMARY:🥊 Richard KOVACS 🇭🇺 - 🇫🇷 Sofiane OUMIHA
-LOCATION:North Paris Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -4525,11 +4417,11 @@ SUMMARY:⛵ Women's Windsurfing - Race 18
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -4537,7 +4429,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -4567,6 +4459,22 @@ SUMMARY:🏹 Alexandr YEREMENKO 🇰🇿 - 🇫🇷 Baptiste ADDIS
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/general/FSM.ics b/docs/general/FSM.ics
index 21dd38607..78b91ac7f 100644
--- a/docs/general/FSM.ics
+++ b/docs/general/FSM.ics
@@ -17,18 +17,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/GAM.ics b/docs/general/GAM.ics
index 8ad609928..561ce3691 100644
--- a/docs/general/GAM.ics
+++ b/docs/general/GAM.ics
@@ -17,18 +17,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/GBR.ics b/docs/general/GBR.ics
index 7d46fd1a8..adbb63f54 100644
--- a/docs/general/GBR.ics
+++ b/docs/general/GBR.ics
@@ -160,18 +160,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -180,18 +173,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -200,19 +186,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -232,27 +211,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -261,27 +223,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -423,12 +368,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -437,11 +379,8 @@ UID:20240727T191200Z-swimming-MENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240727T191200Z
 DTSTART:20240727T191200Z
 DTEND:20240727T202600Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇬🇧 Adam
-  PEATY\n🇳🇱 Arno KAMMINGA\n🇦🇹 Bernhard REITSHAMMER\n🇳🇱 Caspar
-  CORBEAU\n🇺🇸 Charlie SWANSON\n🇬🇧 James WILBY\n🇦🇺 Joshua YONG\n🇩🇪
-  Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇩🇪 Melvin IMOUDU\n🇺🇸
-  Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN Haiyang\n🇮🇱 Ron POLONSKY
+DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇳🇱 NED\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -574,16 +513,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -617,12 +550,9 @@ UID:20240728T091500Z-swimming-MENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240728T091500Z
 DTSTART:20240728T091500Z
 DTEND:20240728T092700Z
-DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇮🇹 Alberto
-  RAZZETTI\n🇬🇷 Apostolos PAPASTAMOS\n🇭🇺 Balazs HOLLO\n🇦🇺 Brendon
-  SMITH\n🇺🇸 Carson FOSTER\n🇩🇪 Cedric BUESSING\n🇺🇸 Chase KALISZ\n🇭🇺
-  Gabor ZOMBORI\n🇫🇷 Leon MARCHAND\n🇳🇿 Lewis CLAREBURT\n🇯🇵 MATSUSHITA
-  Tomoyuki\n🇬🇧 Max LITCHFIELD\n🇯🇵 SETO Daiya\n🇨🇦 Tristan
-  JANKOVICS\n🇦🇺 William Campbell PETRIC\n🇨🇳 ZHANG Zhanshuo
+DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇳🇿 NZL\n🇺🇸 USA
 SUMMARY:🏊 Men's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -640,18 +570,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -672,22 +596,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -970,12 +885,9 @@ UID:20240728T184600Z-swimming-MENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T184600Z
 DTSTART:20240728T184600Z
 DTEND:20240728T190000Z
-DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇮🇹 Alessandro
-  RAGAINI\n🇱🇹 Danas RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧
-  Duncan SCOTT\n🇮🇹 Filippo MEGLI\n🇰🇷 HWANG Sunwoo\n🇰🇷 KIM
-  Woomin\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵
-  MATSUMOTO Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian
-  GIULIANI\n🇩🇪 Rafael MIROSLAW\n🇦🇺 Thomas NEILL
+DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹
+  LTU\n🇷🇴 ROU\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -984,12 +896,9 @@ UID:20240728T191000Z-swimming-WOMENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240728T191000Z
 DTSTART:20240728T191000Z
 DTEND:20240728T192200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇬🇧 Angharad
-  EVANS\n🇮🇹 Benedetta PILATO\n🇪🇪 Eneli JEFIMOVA\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇦🇷 Macarena
-  CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI
-  Satomi\n🇸🇪 Sophie HANSSON\n🇨🇳 TANG Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱
-  Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇦🇷 ARG\n🇨🇳
+  CHN\n🇪🇪 EST\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱
+  NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -998,12 +907,9 @@ UID:20240728T193200Z-swimming-MENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240728T193200Z
 DTSTART:20240728T193200Z
 DTEND:20240728T194400Z
-DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇬🇷 Apostolos
-  CHRISTOU\n🇨🇦 Blake TIERNEY\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert
-  KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇬🇧 Jonny
-  MARSHALL\n🇵🇱 Ksawery MASIUK\n🇫🇷 Mewen TOMAC\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇺🇸 Ryan MURPHY\n🇮🇹
-  Thomas CECCON\n🇨🇳 XU Jiayu\n🇫🇷 Yohann NDOYE-BROUARD
+DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹 ITA\n🇵🇱
+  POL\n🇿🇦 RSA\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1128,12 +1034,9 @@ UID:20240729T090000Z-swimming-WOMENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240729T090000Z
 DTSTART:20240729T090000Z
 DTEND:20240729T091200Z
-DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇮🇱
-  Anastasia GORBENKO\n🇷🇸 Anja CREVAR\n🇨🇦 Ella JANSEN\n🇦🇺 Ella
-  RAMSAY\n🇮🇪 Ellen WALSHE\n🇪🇸 Emma CARRASCO CADENS\n🇺🇸 Emma
-  WEYANT\n🇬🇧 Freya Constance COLBERT\n🇦🇺 Jenna FORRESTER\n🇺🇸 Katie
-  GRIMES\n🇬🇧 Katie SHANAHAN\n🇯🇵 NARITA Mio\n🇮🇹 Sara FRANCESCHI\n🇨🇦
-  Summer McINTOSH\n🇯🇵 TANIGAWA Ageha\n🇭🇺 Vivien JACKL
+DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵
+  JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1142,18 +1045,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -2283,16 +2179,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -2311,30 +2201,44 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2367,42 +2271,10 @@ SUMMARY:🥊 Chantelle Jordan REID 🇬🇧 - 🇲🇦 Khadija MARDI
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2415,10 +2287,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2431,6 +2303,21 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
+DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T124445Z-cycling-bmx-freestyle-MENS-PARK-FINAL
 DTSTAMP:20240731T124445Z
 DTSTART:20240731T124445Z
@@ -2443,34 +2330,51 @@ SUMMARY:🚴 Men's Park Final
 LOCATION:La Concorde 2
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
   LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
   McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
   FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
   SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 10
+SUMMARY:⛵ Men's Skiff - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2489,57 +2393,43 @@ SUMMARY:🛶 Women's Canoe Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
 DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
@@ -2551,37 +2441,51 @@ SUMMARY:⛵ Men's Skiff - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 8
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 9
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2610,23 +2514,6 @@ SUMMARY:🏹 Jean-Charles VALLADONT 🇫🇷 - 🇬🇧 Conor HALL
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T155800Z-archery-MENS-INDIVIDUAL-132-ELIMINATION-ROUND-GBR-IND
 DTSTAMP:20240731T155800Z
 DTSTART:20240731T155800Z
@@ -2636,23 +2523,6 @@ SUMMARY:🏹 Tom HALL 🇬🇧 - 🇮🇳 Tarundeep RAI
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T162400Z-archery-WOMENS-INDIVIDUAL-132-ELIMINATION-ROUND-GBR-ES
 DTSTAMP:20240731T162400Z
 DTSTART:20240731T162400Z
@@ -2662,23 +2532,6 @@ SUMMARY:🏹 Megs HAVERS 🇬🇧 - 🇪🇸 Elia CANALES
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T184800Z-boxing-MENS-71KG-PRELIMINARIES-ROUND-OF-16-GBR-SRB
 DTSTAMP:20240731T184800Z
 DTSTART:20240731T184800Z
@@ -2812,11 +2665,11 @@ SUMMARY:🏑 FRA 🇫🇷 - 🇬🇧 GBR
 LOCATION:Yves-du-Manoir Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
 DTSTAMP:20240801T130300Z
 DTSTART:20240801T130300Z
 DTEND:20240801T132400Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
+DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
   SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
@@ -2825,7 +2678,7 @@ DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
   TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
   STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 13
+SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2844,10 +2697,43 @@ SUMMARY:🛶 Men's Kayak Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
 DTSTAMP:20240801T133400Z
 DTSTART:20240801T133400Z
 DTEND:20240801T135500Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 13
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -2861,10 +2747,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2877,10 +2763,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -2894,10 +2780,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2910,10 +2796,19 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150000Z-hockey-WOMENS-POOL-B-USA-GBR
+DTSTAMP:20240801T150000Z
+DTSTART:20240801T150000Z
+DTEND:20240801T163000Z
+DESCRIPTION:Hockey - Women's Pool B
+SUMMARY:🏑 USA 🇺🇸 - 🇬🇧 GBR
+LOCATION:Yves-du-Manoir Stadium
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -2927,10 +2822,19 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T151400Z-archery-WOMENS-INDIVIDUAL-132-ELIMINATION-ROUND-KOR-GB
+DTSTAMP:20240801T151400Z
+DTSTART:20240801T151400Z
+DTEND:20240801T152700Z
+DESCRIPTION:Archery - Women's Individual 1/32 Elimination Round
+SUMMARY:🏹 JEON Hunyoung 🇰🇷 - 🇬🇧 Penny HEALEY
+LOCATION:Invalides
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2943,19 +2847,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150000Z-hockey-WOMENS-POOL-B-USA-GBR
-DTSTAMP:20240801T150000Z
-DTSTART:20240801T150000Z
-DTEND:20240801T163000Z
-DESCRIPTION:Hockey - Women's Pool B
-SUMMARY:🏑 USA 🇺🇸 - 🇬🇧 GBR
-LOCATION:Yves-du-Manoir Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -2969,31 +2864,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T151400Z-archery-WOMENS-INDIVIDUAL-132-ELIMINATION-ROUND-KOR-GB
-DTSTAMP:20240801T151400Z
-DTSTART:20240801T151400Z
-DTEND:20240801T152700Z
-DESCRIPTION:Archery - Women's Individual 1/32 Elimination Round
-SUMMARY:🏹 JEON Hunyoung 🇰🇷 - 🇬🇧 Penny HEALEY
-LOCATION:Invalides
-END:VEVENT
-BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -3011,11 +2881,11 @@ SUMMARY:⛵ Women's Windsurfing - Race 18
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -3023,7 +2893,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -3053,6 +2923,22 @@ SUMMARY:⛵ Women's Windsurfing - Race 19
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/general/GEO.ics b/docs/general/GEO.ics
index 82374ac7a..c61f09adc 100644
--- a/docs/general/GEO.ics
+++ b/docs/general/GEO.ics
@@ -17,18 +17,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -123,22 +116,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/GER.ics b/docs/general/GER.ics
index 82e5cf4ec..4803218a0 100644
--- a/docs/general/GER.ics
+++ b/docs/general/GER.ics
@@ -234,18 +234,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -254,14 +247,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -281,18 +270,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -301,19 +283,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -322,27 +297,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -589,12 +547,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -627,11 +582,8 @@ UID:20240727T191200Z-swimming-MENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240727T191200Z
 DTSTART:20240727T191200Z
 DTEND:20240727T202600Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇬🇧 Adam
-  PEATY\n🇳🇱 Arno KAMMINGA\n🇦🇹 Bernhard REITSHAMMER\n🇳🇱 Caspar
-  CORBEAU\n🇺🇸 Charlie SWANSON\n🇬🇧 James WILBY\n🇦🇺 Joshua YONG\n🇩🇪
-  Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇩🇪 Melvin IMOUDU\n🇺🇸
-  Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN Haiyang\n🇮🇱 Ron POLONSKY
+DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇳🇱 NED\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -810,16 +762,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -862,12 +808,9 @@ UID:20240728T091500Z-swimming-MENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240728T091500Z
 DTSTART:20240728T091500Z
 DTEND:20240728T092700Z
-DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇮🇹 Alberto
-  RAZZETTI\n🇬🇷 Apostolos PAPASTAMOS\n🇭🇺 Balazs HOLLO\n🇦🇺 Brendon
-  SMITH\n🇺🇸 Carson FOSTER\n🇩🇪 Cedric BUESSING\n🇺🇸 Chase KALISZ\n🇭🇺
-  Gabor ZOMBORI\n🇫🇷 Leon MARCHAND\n🇳🇿 Lewis CLAREBURT\n🇯🇵 MATSUSHITA
-  Tomoyuki\n🇬🇧 Max LITCHFIELD\n🇯🇵 SETO Daiya\n🇨🇦 Tristan
-  JANKOVICS\n🇦🇺 William Campbell PETRIC\n🇨🇳 ZHANG Zhanshuo
+DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇳🇿 NZL\n🇺🇸 USA
 SUMMARY:🏊 Men's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -876,18 +819,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -896,22 +833,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -947,18 +875,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1305,12 +1226,9 @@ UID:20240728T184600Z-swimming-MENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T184600Z
 DTSTART:20240728T184600Z
 DTEND:20240728T190000Z
-DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇮🇹 Alessandro
-  RAGAINI\n🇱🇹 Danas RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧
-  Duncan SCOTT\n🇮🇹 Filippo MEGLI\n🇰🇷 HWANG Sunwoo\n🇰🇷 KIM
-  Woomin\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵
-  MATSUMOTO Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian
-  GIULIANI\n🇩🇪 Rafael MIROSLAW\n🇦🇺 Thomas NEILL
+DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹
+  LTU\n🇷🇴 ROU\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1473,17 +1391,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -2674,33 +2586,45 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2733,42 +2657,10 @@ SUMMARY:🏑 FRA 🇫🇷 - 🇩🇪 GER
 LOCATION:Yves-du-Manoir Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2781,10 +2673,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2797,10 +2689,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
 DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
@@ -2821,19 +2713,51 @@ SUMMARY:🏓 Felix LEBRUN 🇫🇷 - 🇩🇪 Dimitrij OVTCHAROV
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2852,57 +2776,43 @@ SUMMARY:🛶 Women's Canoe Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
 DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
@@ -2914,37 +2824,51 @@ SUMMARY:⛵ Men's Skiff - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 8
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 9
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2982,57 +2906,6 @@ SUMMARY:🏑 GER 🇩🇪 - 🇳🇱 NED
 LOCATION:Yves-du-Manoir Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T170000Z-football-WOMENS-GROUP-B-ZAM-GER
 DTSTAMP:20240731T170000Z
 DTSTART:20240731T170000Z
@@ -3173,11 +3046,11 @@ SUMMARY:🏹 Florian UNRUH 🇩🇪 - 🇪🇬 Youssof TOLBA
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
 DTSTAMP:20240801T130300Z
 DTSTART:20240801T130300Z
 DTEND:20240801T132400Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
+DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
   SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
@@ -3186,7 +3059,7 @@ DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
   TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
   STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 13
+SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -3205,10 +3078,43 @@ SUMMARY:🛶 Men's Kayak Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
 DTSTAMP:20240801T133400Z
 DTSTART:20240801T133400Z
 DTEND:20240801T135500Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 13
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -3222,10 +3128,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -3238,10 +3144,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -3255,10 +3161,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -3271,10 +3177,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -3288,10 +3194,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -3304,10 +3210,19 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T152700Z-archery-WOMENS-INDIVIDUAL-132-ELIMINATION-ROUND-GER-ME
+DTSTAMP:20240801T152700Z
+DTSTART:20240801T152700Z
+DTEND:20240801T154000Z
+DESCRIPTION:Archery - Women's Individual 1/32 Elimination Round
+SUMMARY:🏹 Charline SCHWARZ 🇩🇪 - 🇲🇽 Ana VAZQUEZ
+LOCATION:Invalides
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -3321,31 +3236,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240801T152700Z-archery-WOMENS-INDIVIDUAL-132-ELIMINATION-ROUND-GER-ME
-DTSTAMP:20240801T152700Z
-DTSTART:20240801T152700Z
-DTEND:20240801T154000Z
-DESCRIPTION:Archery - Women's Individual 1/32 Elimination Round
-SUMMARY:🏹 Charline SCHWARZ 🇩🇪 - 🇲🇽 Ana VAZQUEZ
-LOCATION:Invalides
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -3363,11 +3253,11 @@ SUMMARY:⛵ Women's Windsurfing - Race 18
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -3375,7 +3265,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -3396,6 +3286,22 @@ SUMMARY:⛵ Women's Windsurfing - Race 19
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/general/GRE.ics b/docs/general/GRE.ics
index 3bf2e0537..9f7f691d6 100644
--- a/docs/general/GRE.ics
+++ b/docs/general/GRE.ics
@@ -31,18 +31,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -51,27 +44,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -132,12 +108,9 @@ UID:20240728T091500Z-swimming-MENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240728T091500Z
 DTSTART:20240728T091500Z
 DTEND:20240728T092700Z
-DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇮🇹 Alberto
-  RAZZETTI\n🇬🇷 Apostolos PAPASTAMOS\n🇭🇺 Balazs HOLLO\n🇦🇺 Brendon
-  SMITH\n🇺🇸 Carson FOSTER\n🇩🇪 Cedric BUESSING\n🇺🇸 Chase KALISZ\n🇭🇺
-  Gabor ZOMBORI\n🇫🇷 Leon MARCHAND\n🇳🇿 Lewis CLAREBURT\n🇯🇵 MATSUSHITA
-  Tomoyuki\n🇬🇧 Max LITCHFIELD\n🇯🇵 SETO Daiya\n🇨🇦 Tristan
-  JANKOVICS\n🇦🇺 William Campbell PETRIC\n🇨🇳 ZHANG Zhanshuo
+DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇳🇿 NZL\n🇺🇸 USA
 SUMMARY:🏊 Men's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -158,22 +131,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -247,12 +211,9 @@ UID:20240728T193200Z-swimming-MENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240728T193200Z
 DTSTART:20240728T193200Z
 DTEND:20240728T194400Z
-DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇬🇷 Apostolos
-  CHRISTOU\n🇨🇦 Blake TIERNEY\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert
-  KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇬🇧 Jonny
-  MARSHALL\n🇵🇱 Ksawery MASIUK\n🇫🇷 Mewen TOMAC\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇺🇸 Ryan MURPHY\n🇮🇹
-  Thomas CECCON\n🇨🇳 XU Jiayu\n🇫🇷 Yohann NDOYE-BROUARD
+DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹 ITA\n🇵🇱
+  POL\n🇿🇦 RSA\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -272,17 +233,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -564,16 +519,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -602,13 +551,9 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -622,10 +567,10 @@ SUMMARY:🏓 Kanak JHA 🇺🇸 - 🇬🇷 Panagiotis GIONIS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -638,10 +583,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -654,10 +599,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -670,10 +615,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -686,22 +631,6 @@ SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T180500Z-water-polo-WOMENS-PRELIMINARY-ROUND-GROUP-B-ESP-GRE
 DTSTAMP:20240731T180500Z
 DTSTART:20240731T180500Z
@@ -769,10 +698,26 @@ SUMMARY:🏊 Men's 200m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
 DTSTAMP:20240801T135300Z
 DTSTART:20240801T135300Z
 DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -785,10 +730,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -801,10 +746,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -817,10 +762,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T155700Z
+DTSTART:20240801T155700Z
+DTEND:20240801T161800Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -833,10 +778,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T155700Z
-DTSTART:20240801T155700Z
-DTEND:20240801T161800Z
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
diff --git a/docs/general/GRN.ics b/docs/general/GRN.ics
index f5e5b9d15..499b22dce 100644
--- a/docs/general/GRN.ics
+++ b/docs/general/GRN.ics
@@ -17,22 +17,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/GUA.ics b/docs/general/GUA.ics
index 8920d7a1e..f8e31e058 100644
--- a/docs/general/GUA.ics
+++ b/docs/general/GUA.ics
@@ -54,18 +54,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/GUY.ics b/docs/general/GUY.ics
index d19837ec1..efbb7c300 100644
--- a/docs/general/GUY.ics
+++ b/docs/general/GUY.ics
@@ -17,19 +17,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/HAI.ics b/docs/general/HAI.ics
index 8afd80cc7..120b5601f 100644
--- a/docs/general/HAI.ics
+++ b/docs/general/HAI.ics
@@ -17,18 +17,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/HKG.ics b/docs/general/HKG.ics
index 5367ec93a..9bbf89dae 100644
--- a/docs/general/HKG.ics
+++ b/docs/general/HKG.ics
@@ -49,27 +49,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -170,18 +153,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -271,13 +247,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -295,18 +267,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -875,144 +840,10 @@ SUMMARY:🏓 WONG Chun Ting 🇭🇰 - 🇨🇳 FAN Zhendong
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 7
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T134000Z-badminton-MENS-SINGLES-GROUP-PLAY-STAGE-GROUP-I-TPE-HK
-DTSTAMP:20240731T134000Z
-DTSTART:20240731T134000Z
-DTEND:20240731T142000Z
-DESCRIPTION:Badminton - Men's Singles Group Play Stage - Group I
-SUMMARY:🏸 CHOU Tien Chen 🇹🇼 - 🇭🇰 LEE Cheuk Yiu
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1026,10 +857,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1043,10 +874,72 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 7
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
+DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1060,10 +953,19 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T134000Z-badminton-MENS-SINGLES-GROUP-PLAY-STAGE-GROUP-I-TPE-HK
+DTSTAMP:20240731T134000Z
+DTSTART:20240731T134000Z
+DTEND:20240731T142000Z
+DESCRIPTION:Badminton - Men's Singles Group Play Stage - Group I
+SUMMARY:🏸 CHOU Tien Chen 🇹🇼 - 🇭🇰 LEE Cheuk Yiu
+LOCATION:La Chapelle Arena
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1077,20 +979,50 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 12
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -1152,10 +1084,27 @@ SUMMARY:🏊 Men's 50m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
 DTSTAMP:20240801T130300Z
 DTSTART:20240801T130300Z
 DTEND:20240801T132400Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1169,10 +1118,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1186,10 +1151,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -1202,10 +1167,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1219,10 +1184,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -1235,10 +1200,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1252,10 +1217,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -1268,10 +1233,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1285,22 +1250,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -1318,11 +1267,11 @@ SUMMARY:⛵ Women's Windsurfing - Race 18
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -1330,7 +1279,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -1351,6 +1300,22 @@ SUMMARY:⛵ Women's Windsurfing - Race 19
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/general/HON.ics b/docs/general/HON.ics
index e8310b7c0..ae34fee22 100644
--- a/docs/general/HON.ics
+++ b/docs/general/HON.ics
@@ -17,18 +17,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/HUN.ics b/docs/general/HUN.ics
index ec86375fb..7031a2afb 100644
--- a/docs/general/HUN.ics
+++ b/docs/general/HUN.ics
@@ -94,14 +94,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -119,19 +115,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -140,27 +129,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -169,27 +141,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -430,16 +385,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -473,12 +422,9 @@ UID:20240728T091500Z-swimming-MENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240728T091500Z
 DTSTART:20240728T091500Z
 DTEND:20240728T092700Z
-DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇮🇹 Alberto
-  RAZZETTI\n🇬🇷 Apostolos PAPASTAMOS\n🇭🇺 Balazs HOLLO\n🇦🇺 Brendon
-  SMITH\n🇺🇸 Carson FOSTER\n🇩🇪 Cedric BUESSING\n🇺🇸 Chase KALISZ\n🇭🇺
-  Gabor ZOMBORI\n🇫🇷 Leon MARCHAND\n🇳🇿 Lewis CLAREBURT\n🇯🇵 MATSUSHITA
-  Tomoyuki\n🇬🇧 Max LITCHFIELD\n🇯🇵 SETO Daiya\n🇨🇦 Tristan
-  JANKOVICS\n🇦🇺 William Campbell PETRIC\n🇨🇳 ZHANG Zhanshuo
+DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇳🇿 NZL\n🇺🇸 USA
 SUMMARY:🏊 Men's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -505,22 +451,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -540,18 +477,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -743,12 +673,9 @@ UID:20240728T193200Z-swimming-MENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240728T193200Z
 DTSTART:20240728T193200Z
 DTEND:20240728T194400Z
-DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇬🇷 Apostolos
-  CHRISTOU\n🇨🇦 Blake TIERNEY\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert
-  KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇬🇧 Jonny
-  MARSHALL\n🇵🇱 Ksawery MASIUK\n🇫🇷 Mewen TOMAC\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇺🇸 Ryan MURPHY\n🇮🇹
-  Thomas CECCON\n🇨🇳 XU Jiayu\n🇫🇷 Yohann NDOYE-BROUARD
+DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹 ITA\n🇵🇱
+  POL\n🇿🇦 RSA\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -757,13 +684,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -809,12 +732,9 @@ UID:20240729T090000Z-swimming-WOMENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240729T090000Z
 DTSTART:20240729T090000Z
 DTEND:20240729T091200Z
-DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇮🇱
-  Anastasia GORBENKO\n🇷🇸 Anja CREVAR\n🇨🇦 Ella JANSEN\n🇦🇺 Ella
-  RAMSAY\n🇮🇪 Ellen WALSHE\n🇪🇸 Emma CARRASCO CADENS\n🇺🇸 Emma
-  WEYANT\n🇬🇧 Freya Constance COLBERT\n🇦🇺 Jenna FORRESTER\n🇺🇸 Katie
-  GRIMES\n🇬🇧 Katie SHANAHAN\n🇯🇵 NARITA Mio\n🇮🇹 Sara FRANCESCHI\n🇨🇦
-  Summer McINTOSH\n🇯🇵 TANIGAWA Ageha\n🇭🇺 Vivien JACKL
+DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵
+  JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -841,17 +761,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1229,16 +1143,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1247,13 +1155,9 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/IND.ics b/docs/general/IND.ics
index ee33308d2..4eb8a4e44 100644
--- a/docs/general/IND.ics
+++ b/docs/general/IND.ics
@@ -289,22 +289,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -324,18 +315,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/IRL.ics b/docs/general/IRL.ics
index 3e7087be1..33876afc0 100644
--- a/docs/general/IRL.ics
+++ b/docs/general/IRL.ics
@@ -103,18 +103,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -145,27 +138,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -356,18 +332,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -499,12 +469,9 @@ UID:20240728T191000Z-swimming-WOMENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240728T191000Z
 DTSTART:20240728T191000Z
 DTEND:20240728T192200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇬🇧 Angharad
-  EVANS\n🇮🇹 Benedetta PILATO\n🇪🇪 Eneli JEFIMOVA\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇦🇷 Macarena
-  CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI
-  Satomi\n🇸🇪 Sophie HANSSON\n🇨🇳 TANG Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱
-  Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇦🇷 ARG\n🇨🇳
+  CHN\n🇪🇪 EST\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱
+  NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -572,12 +539,9 @@ UID:20240729T090000Z-swimming-WOMENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240729T090000Z
 DTSTART:20240729T090000Z
 DTEND:20240729T091200Z
-DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇮🇱
-  Anastasia GORBENKO\n🇷🇸 Anja CREVAR\n🇨🇦 Ella JANSEN\n🇦🇺 Ella
-  RAMSAY\n🇮🇪 Ellen WALSHE\n🇪🇸 Emma CARRASCO CADENS\n🇺🇸 Emma
-  WEYANT\n🇬🇧 Freya Constance COLBERT\n🇦🇺 Jenna FORRESTER\n🇺🇸 Katie
-  GRIMES\n🇬🇧 Katie SHANAHAN\n🇯🇵 NARITA Mio\n🇮🇹 Sara FRANCESCHI\n🇨🇦
-  Summer McINTOSH\n🇯🇵 TANIGAWA Ageha\n🇭🇺 Vivien JACKL
+DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵
+  JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -586,18 +550,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -606,17 +563,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -744,12 +695,9 @@ UID:20240729T190100Z-swimming-WOMENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240729T190100Z
 DTSTART:20240729T190100Z
 DTEND:20240729T191500Z
-DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇫🇷 Beryl
-  GASTALDELLO\n🇪🇸 Carmen WEILER SASTRE\n🇮🇪 Danielle HILL\n🇫🇷 Emma
-  TEREBO\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪
-  Louise HANSSON\n🇳🇱 Maaike de WAARD\n🇺🇸 Regan SMITH\n🇧🇪 Roos
-  VANOTTERDIJK\n🇨🇳 WAN Letian\n🇨🇳 WANG Xueer
+DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇮🇪 IRL\n🇳🇱 NED\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -992,14 +940,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1043,10 +987,10 @@ SUMMARY:🏸 Carolina MARIN 🇪🇸 - 🇮🇪 Rachael DARRAGH
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
 DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
@@ -1058,6 +1002,21 @@ SUMMARY:⛵ Men's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T133000Z-boxing-MENS-57KG-PRELIMINARIES-ROUND-OF-16-PHI-IRL
 DTSTAMP:20240731T133000Z
 DTSTART:20240731T133000Z
@@ -1067,25 +1026,10 @@ SUMMARY:🥊 Carlo PAALAM 🇵🇭 - 🇮🇪 Jude GALLAGHER
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
 DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
diff --git a/docs/general/ISL.ics b/docs/general/ISL.ics
index 567fc4ea3..3ebd933ab 100644
--- a/docs/general/ISL.ics
+++ b/docs/general/ISL.ics
@@ -17,18 +17,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -37,18 +30,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -57,13 +43,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/ISR.ics b/docs/general/ISR.ics
index d6b4093fc..6556074d8 100644
--- a/docs/general/ISR.ics
+++ b/docs/general/ISR.ics
@@ -112,18 +112,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -132,27 +125,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -179,11 +155,8 @@ UID:20240727T191200Z-swimming-MENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240727T191200Z
 DTSTART:20240727T191200Z
 DTEND:20240727T202600Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇬🇧 Adam
-  PEATY\n🇳🇱 Arno KAMMINGA\n🇦🇹 Bernhard REITSHAMMER\n🇳🇱 Caspar
-  CORBEAU\n🇺🇸 Charlie SWANSON\n🇬🇧 James WILBY\n🇦🇺 Joshua YONG\n🇩🇪
-  Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇩🇪 Melvin IMOUDU\n🇺🇸
-  Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN Haiyang\n🇮🇱 Ron POLONSKY
+DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇳🇱 NED\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -220,16 +193,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -272,18 +239,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -301,22 +262,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -334,18 +286,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -372,12 +317,9 @@ UID:20240728T184600Z-swimming-MENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T184600Z
 DTSTART:20240728T184600Z
 DTEND:20240728T190000Z
-DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇮🇹 Alessandro
-  RAGAINI\n🇱🇹 Danas RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧
-  Duncan SCOTT\n🇮🇹 Filippo MEGLI\n🇰🇷 HWANG Sunwoo\n🇰🇷 KIM
-  Woomin\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵
-  MATSUMOTO Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian
-  GIULIANI\n🇩🇪 Rafael MIROSLAW\n🇦🇺 Thomas NEILL
+DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹
+  LTU\n🇷🇴 ROU\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -413,12 +355,9 @@ UID:20240729T090000Z-swimming-WOMENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240729T090000Z
 DTSTART:20240729T090000Z
 DTEND:20240729T091200Z
-DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇮🇱
-  Anastasia GORBENKO\n🇷🇸 Anja CREVAR\n🇨🇦 Ella JANSEN\n🇦🇺 Ella
-  RAMSAY\n🇮🇪 Ellen WALSHE\n🇪🇸 Emma CARRASCO CADENS\n🇺🇸 Emma
-  WEYANT\n🇬🇧 Freya Constance COLBERT\n🇦🇺 Jenna FORRESTER\n🇺🇸 Katie
-  GRIMES\n🇬🇧 Katie SHANAHAN\n🇯🇵 NARITA Mio\n🇮🇹 Sara FRANCESCHI\n🇨🇦
-  Summer McINTOSH\n🇯🇵 TANIGAWA Ageha\n🇭🇺 Vivien JACKL
+DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵
+  JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -427,18 +366,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -874,113 +806,18 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T115700Z-archery-WOMENS-INDIVIDUAL-132-ELIMINATION-ROUND-ROU-IS
-DTSTAMP:20240731T115700Z
-DTSTART:20240731T115700Z
-DTEND:20240731T121000Z
-DESCRIPTION:Archery - Women's Individual 1/32 Elimination Round
-SUMMARY:🏹 Madalina AMAISTROAIE 🇷🇴 - 🇮🇱 Mikaella MOSHE
-LOCATION:Invalides
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 7
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -994,10 +831,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1011,10 +848,51 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 7
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T115700Z-archery-WOMENS-INDIVIDUAL-132-ELIMINATION-ROUND-ROU-IS
+DTSTAMP:20240731T115700Z
+DTSTART:20240731T115700Z
+DTEND:20240731T121000Z
+DESCRIPTION:Archery - Women's Individual 1/32 Elimination Round
+SUMMARY:🏹 Madalina AMAISTROAIE 🇷🇴 - 🇮🇱 Mikaella MOSHE
+LOCATION:Invalides
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1028,10 +906,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1045,20 +923,35 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 12
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -1158,10 +1051,36 @@ SUMMARY:🏊 Women's 4 x 200m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
 DTSTAMP:20240801T130300Z
 DTSTART:20240801T130300Z
 DTEND:20240801T132400Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T133000Z-archery-MENS-INDIVIDUAL-132-ELIMINATION-ROUND-NED-ISR
+DTSTAMP:20240801T133000Z
+DTSTART:20240801T133000Z
+DTEND:20240801T134300Z
+DESCRIPTION:Archery - Men's Individual 1/32 Elimination Round
+SUMMARY:🏹 Steve WIJLER 🇳🇱 - 🇮🇱 Roy DROR
+LOCATION:Invalides
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1175,19 +1094,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133000Z-archery-MENS-INDIVIDUAL-132-ELIMINATION-ROUND-NED-ISR
-DTSTAMP:20240801T133000Z
-DTSTART:20240801T133000Z
-DTEND:20240801T134300Z
-DESCRIPTION:Archery - Men's Individual 1/32 Elimination Round
-SUMMARY:🏹 Steve WIJLER 🇳🇱 - 🇮🇱 Roy DROR
-LOCATION:Invalides
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1201,10 +1127,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -1217,10 +1143,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1234,10 +1160,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -1250,10 +1176,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1267,10 +1193,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -1283,10 +1209,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1300,22 +1226,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -1333,11 +1243,11 @@ SUMMARY:⛵ Women's Windsurfing - Race 18
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -1345,7 +1255,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -1366,6 +1276,22 @@ SUMMARY:⛵ Women's Windsurfing - Race 19
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/general/ISV.ics b/docs/general/ISV.ics
index c408ed5b0..d16dac37f 100644
--- a/docs/general/ISV.ics
+++ b/docs/general/ISV.ics
@@ -46,14 +46,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -62,22 +58,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/ITA.ics b/docs/general/ITA.ics
index 065de9207..e76ae7190 100644
--- a/docs/general/ITA.ics
+++ b/docs/general/ITA.ics
@@ -189,18 +189,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -229,18 +222,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -258,19 +244,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -308,27 +287,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -346,27 +308,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -606,11 +551,8 @@ UID:20240727T191200Z-swimming-MENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240727T191200Z
 DTSTART:20240727T191200Z
 DTEND:20240727T202600Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇬🇧 Adam
-  PEATY\n🇳🇱 Arno KAMMINGA\n🇦🇹 Bernhard REITSHAMMER\n🇳🇱 Caspar
-  CORBEAU\n🇺🇸 Charlie SWANSON\n🇬🇧 James WILBY\n🇦🇺 Joshua YONG\n🇩🇪
-  Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇩🇪 Melvin IMOUDU\n🇺🇸
-  Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN Haiyang\n🇮🇱 Ron POLONSKY
+DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇳🇱 NED\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -836,16 +778,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -888,12 +824,9 @@ UID:20240728T091500Z-swimming-MENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240728T091500Z
 DTSTART:20240728T091500Z
 DTEND:20240728T092700Z
-DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇮🇹 Alberto
-  RAZZETTI\n🇬🇷 Apostolos PAPASTAMOS\n🇭🇺 Balazs HOLLO\n🇦🇺 Brendon
-  SMITH\n🇺🇸 Carson FOSTER\n🇩🇪 Cedric BUESSING\n🇺🇸 Chase KALISZ\n🇭🇺
-  Gabor ZOMBORI\n🇫🇷 Leon MARCHAND\n🇳🇿 Lewis CLAREBURT\n🇯🇵 MATSUSHITA
-  Tomoyuki\n🇬🇧 Max LITCHFIELD\n🇯🇵 SETO Daiya\n🇨🇦 Tristan
-  JANKOVICS\n🇦🇺 William Campbell PETRIC\n🇨🇳 ZHANG Zhanshuo
+DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇳🇿 NZL\n🇺🇸 USA
 SUMMARY:🏊 Men's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -902,18 +835,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -940,22 +867,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1357,12 +1275,9 @@ UID:20240728T184600Z-swimming-MENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T184600Z
 DTSTART:20240728T184600Z
 DTEND:20240728T190000Z
-DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇮🇹 Alessandro
-  RAGAINI\n🇱🇹 Danas RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧
-  Duncan SCOTT\n🇮🇹 Filippo MEGLI\n🇰🇷 HWANG Sunwoo\n🇰🇷 KIM
-  Woomin\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵
-  MATSUMOTO Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian
-  GIULIANI\n🇩🇪 Rafael MIROSLAW\n🇦🇺 Thomas NEILL
+DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹
+  LTU\n🇷🇴 ROU\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1380,12 +1295,9 @@ UID:20240728T191000Z-swimming-WOMENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240728T191000Z
 DTSTART:20240728T191000Z
 DTEND:20240728T192200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇬🇧 Angharad
-  EVANS\n🇮🇹 Benedetta PILATO\n🇪🇪 Eneli JEFIMOVA\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇦🇷 Macarena
-  CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI
-  Satomi\n🇸🇪 Sophie HANSSON\n🇨🇳 TANG Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱
-  Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇦🇷 ARG\n🇨🇳
+  CHN\n🇪🇪 EST\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱
+  NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1394,12 +1306,9 @@ UID:20240728T193200Z-swimming-MENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240728T193200Z
 DTSTART:20240728T193200Z
 DTEND:20240728T194400Z
-DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇬🇷 Apostolos
-  CHRISTOU\n🇨🇦 Blake TIERNEY\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert
-  KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇬🇧 Jonny
-  MARSHALL\n🇵🇱 Ksawery MASIUK\n🇫🇷 Mewen TOMAC\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇺🇸 Ryan MURPHY\n🇮🇹
-  Thomas CECCON\n🇨🇳 XU Jiayu\n🇫🇷 Yohann NDOYE-BROUARD
+DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹 ITA\n🇵🇱
+  POL\n🇿🇦 RSA\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1541,12 +1450,9 @@ UID:20240729T090000Z-swimming-WOMENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240729T090000Z
 DTSTART:20240729T090000Z
 DTEND:20240729T091200Z
-DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇮🇱
-  Anastasia GORBENKO\n🇷🇸 Anja CREVAR\n🇨🇦 Ella JANSEN\n🇦🇺 Ella
-  RAMSAY\n🇮🇪 Ellen WALSHE\n🇪🇸 Emma CARRASCO CADENS\n🇺🇸 Emma
-  WEYANT\n🇬🇧 Freya Constance COLBERT\n🇦🇺 Jenna FORRESTER\n🇺🇸 Katie
-  GRIMES\n🇬🇧 Katie SHANAHAN\n🇯🇵 NARITA Mio\n🇮🇹 Sara FRANCESCHI\n🇨🇦
-  Summer McINTOSH\n🇯🇵 TANIGAWA Ageha\n🇭🇺 Vivien JACKL
+DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵
+  JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1582,17 +1488,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -2794,14 +2694,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -2810,16 +2706,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -2834,19 +2724,37 @@ SUMMARY:🚣 Lightweight Men's Double Sculls Semifinal A/B 2
 LOCATION:Nautical St - Flat water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2860,22 +2768,6 @@ SUMMARY:🚣 Men's Quadruple Sculls Final A
 LOCATION:Nautical St - Flat water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T113000Z-fencing-MENS-SABRE-TEAM-TABLE-OF-8-ITA-HUN
 DTSTAMP:20240731T113000Z
 DTSTART:20240731T113000Z
@@ -2894,35 +2786,10 @@ SUMMARY:🏹 Md Sagor ISLAM 🇧🇩 - 🇮🇹 Mauro NESPOLI
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T114400Z-archery-WOMENS-INDIVIDUAL-132-ELIMINATION-ROUND-ITA-MA
-DTSTAMP:20240731T114400Z
-DTSTART:20240731T114400Z
-DTEND:20240731T115700Z
-DESCRIPTION:Archery - Women's Individual 1/32 Elimination Round
-SUMMARY:🏹 Chiara REBAGLIATI 🇮🇹 - 🇲🇾 Ariana Nur Dania MOHAMAD ZAIRI
-LOCATION:Invalides
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2935,10 +2802,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2951,6 +2818,15 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T114400Z-archery-WOMENS-INDIVIDUAL-132-ELIMINATION-ROUND-ITA-MA
+DTSTAMP:20240731T114400Z
+DTSTART:20240731T114400Z
+DTEND:20240731T115700Z
+DESCRIPTION:Archery - Women's Individual 1/32 Elimination Round
+SUMMARY:🏹 Chiara REBAGLIATI 🇮🇹 - 🇲🇾 Ariana Nur Dania MOHAMAD ZAIRI
+LOCATION:Invalides
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T124900Z-archery-MENS-INDIVIDUAL-132-ELIMINATION-ROUND-ITA-BHU
 DTSTAMP:20240731T124900Z
 DTSTART:20240731T124900Z
@@ -2960,19 +2836,36 @@ SUMMARY:🏹 Alessandro PAOLI 🇮🇹 - 🇧🇹 Lam DORJI
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2991,10 +2884,75 @@ SUMMARY:🛶 Women's Canoe Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -3007,56 +2965,6 @@ SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T153000Z-artistic-gymnastics-MENS-ALL-AROUND-FINAL
 DTSTAMP:20240731T153000Z
 DTSTART:20240731T153000Z
@@ -3073,40 +2981,6 @@ SUMMARY:🤸 Men's All-Around Final
 LOCATION:Bercy Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T163000Z-water-polo-WOMENS-PRELIMINARY-ROUND-GROUP-B-ITA-USA
 DTSTAMP:20240731T163000Z
 DTSTART:20240731T163000Z
@@ -3116,23 +2990,6 @@ SUMMARY:🤽 ITA 🇮🇹 - 🇺🇸 USA
 LOCATION:Aquatics Centre
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T170300Z-archery-MENS-INDIVIDUAL-132-ELIMINATION-ROUND-SLO-ITA
 DTSTAMP:20240731T170300Z
 DTSTART:20240731T170300Z
@@ -3316,11 +3173,11 @@ SUMMARY:🥊 Imane KHELIF 🇩🇿 - 🇮🇹 Angela CARINI
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
 DTSTAMP:20240801T130300Z
 DTSTART:20240801T130300Z
 DTEND:20240801T132400Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
+DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
   SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
@@ -3329,7 +3186,7 @@ DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
   TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
   STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 13
+SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -3348,10 +3205,43 @@ SUMMARY:🛶 Men's Kayak Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
 DTSTAMP:20240801T133400Z
 DTSTART:20240801T133400Z
 DTEND:20240801T135500Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 13
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -3365,10 +3255,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -3381,10 +3271,19 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143500Z-water-polo-MENS-PRELIMINARY-ROUND-GROUP-A-ITA-MNE
+DTSTAMP:20240801T143500Z
+DTSTART:20240801T143500Z
+DTEND:20240801T160000Z
+DESCRIPTION:Water Polo - Men's Preliminary Round - Group A
+SUMMARY:🤽 ITA 🇮🇹 - 🇲🇪 MNE
+LOCATION:Aquatics Centre
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -3398,10 +3297,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -3414,48 +3313,6 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143500Z-water-polo-MENS-PRELIMINARY-ROUND-GROUP-A-ITA-MNE
-DTSTAMP:20240801T143500Z
-DTSTART:20240801T143500Z
-DTEND:20240801T160000Z
-DESCRIPTION:Water Polo - Men's Preliminary Round - Group A
-SUMMARY:🤽 ITA 🇮🇹 - 🇲🇪 MNE
-LOCATION:Aquatics Centre
-END:VEVENT
-BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 16
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 14
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T150000Z-beach-volleyball-MENS-PRELIMINARY-PHASE-POOL-A-SWE-ITA
 DTSTAMP:20240801T150000Z
 DTSTART:20240801T150000Z
@@ -3474,10 +3331,43 @@ SUMMARY:🏐 ITA 🇮🇹 - 🇳🇱 NED
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
 DTSTAMP:20240801T150700Z
 DTSTART:20240801T150700Z
 DTEND:20240801T152800Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 14
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -3491,22 +3381,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -3524,11 +3398,11 @@ SUMMARY:⛵ Women's Windsurfing - Race 18
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -3536,7 +3410,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -3557,6 +3431,22 @@ SUMMARY:⛵ Women's Windsurfing - Race 19
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/general/JOR.ics b/docs/general/JOR.ics
index d02a24309..32efa1df2 100644
--- a/docs/general/JOR.ics
+++ b/docs/general/JOR.ics
@@ -17,14 +17,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/JPN.ics b/docs/general/JPN.ics
index ad6672d0a..b34588616 100644
--- a/docs/general/JPN.ics
+++ b/docs/general/JPN.ics
@@ -245,18 +245,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -274,14 +267,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -290,18 +279,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -528,12 +510,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -735,16 +714,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -778,12 +751,9 @@ UID:20240728T091500Z-swimming-MENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240728T091500Z
 DTSTART:20240728T091500Z
 DTEND:20240728T092700Z
-DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇮🇹 Alberto
-  RAZZETTI\n🇬🇷 Apostolos PAPASTAMOS\n🇭🇺 Balazs HOLLO\n🇦🇺 Brendon
-  SMITH\n🇺🇸 Carson FOSTER\n🇩🇪 Cedric BUESSING\n🇺🇸 Chase KALISZ\n🇭🇺
-  Gabor ZOMBORI\n🇫🇷 Leon MARCHAND\n🇳🇿 Lewis CLAREBURT\n🇯🇵 MATSUSHITA
-  Tomoyuki\n🇬🇧 Max LITCHFIELD\n🇯🇵 SETO Daiya\n🇨🇦 Tristan
-  JANKOVICS\n🇦🇺 William Campbell PETRIC\n🇨🇳 ZHANG Zhanshuo
+DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇳🇿 NZL\n🇺🇸 USA
 SUMMARY:🏊 Men's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -810,18 +780,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -851,22 +815,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1238,12 +1193,9 @@ UID:20240728T184600Z-swimming-MENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T184600Z
 DTSTART:20240728T184600Z
 DTEND:20240728T190000Z
-DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇮🇹 Alessandro
-  RAGAINI\n🇱🇹 Danas RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧
-  Duncan SCOTT\n🇮🇹 Filippo MEGLI\n🇰🇷 HWANG Sunwoo\n🇰🇷 KIM
-  Woomin\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵
-  MATSUMOTO Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian
-  GIULIANI\n🇩🇪 Rafael MIROSLAW\n🇦🇺 Thomas NEILL
+DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹
+  LTU\n🇷🇴 ROU\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1261,12 +1213,9 @@ UID:20240728T191000Z-swimming-WOMENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240728T191000Z
 DTSTART:20240728T191000Z
 DTEND:20240728T192200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇬🇧 Angharad
-  EVANS\n🇮🇹 Benedetta PILATO\n🇪🇪 Eneli JEFIMOVA\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇦🇷 Macarena
-  CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI
-  Satomi\n🇸🇪 Sophie HANSSON\n🇨🇳 TANG Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱
-  Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇦🇷 ARG\n🇨🇳
+  CHN\n🇪🇪 EST\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱
+  NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1426,12 +1375,9 @@ UID:20240729T090000Z-swimming-WOMENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240729T090000Z
 DTSTART:20240729T090000Z
 DTEND:20240729T091200Z
-DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇮🇱
-  Anastasia GORBENKO\n🇷🇸 Anja CREVAR\n🇨🇦 Ella JANSEN\n🇦🇺 Ella
-  RAMSAY\n🇮🇪 Ellen WALSHE\n🇪🇸 Emma CARRASCO CADENS\n🇺🇸 Emma
-  WEYANT\n🇬🇧 Freya Constance COLBERT\n🇦🇺 Jenna FORRESTER\n🇺🇸 Katie
-  GRIMES\n🇬🇧 Katie SHANAHAN\n🇯🇵 NARITA Mio\n🇮🇹 Sara FRANCESCHI\n🇨🇦
-  Summer McINTOSH\n🇯🇵 TANIGAWA Ageha\n🇭🇺 Vivien JACKL
+DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵
+  JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -2513,14 +2459,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -2547,16 +2489,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -2565,13 +2501,9 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -2594,22 +2526,6 @@ SUMMARY:🏓 Dina MESHREF 🇪🇬 - 🇯🇵 Hina HAYATA
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T110000Z-volleyball-MENS-PRELIMINARY-ROUND-POOL-C-JPN-ARG
 DTSTAMP:20240731T110000Z
 DTSTART:20240731T110000Z
@@ -2619,35 +2535,35 @@ SUMMARY:🏐 JPN 🇯🇵 - 🇦🇷 ARG
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2669,38 +2585,6 @@ SUMMARY:🤾 ESP 🇪🇸 - 🇯🇵 JPN
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 7
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T124445Z-cycling-bmx-freestyle-MENS-PARK-FINAL
 DTSTAMP:20240731T124445Z
 DTSTART:20240731T124445Z
@@ -2722,35 +2606,19 @@ SUMMARY:🏸 NISHIMOTO Kenta 🇯🇵 - 🇨🇦 Brian YANG
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2763,6 +2631,22 @@ SUMMARY:🏸 OHORI Aya 🇯🇵 - 🇵🇪 Ines Lucia CASTILLO
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T140000Z-table-tennis-MENS-SINGLES-ROUND-OF-16-KOR-JPN
 DTSTAMP:20240731T140000Z
 DTSTART:20240731T140000Z
@@ -2772,11 +2656,11 @@ SUMMARY:🏓 JANG Woojin 🇰🇷 - 🇯🇵 Shunsuke TOGAMI
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -2784,7 +2668,39 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
+SUMMARY:⛵ Men's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2947,11 +2863,11 @@ SUMMARY:🛶 Men's Kayak Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
 DTSTAMP:20240801T135300Z
 DTSTART:20240801T135300Z
 DTEND:20240801T141400Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -2959,7 +2875,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 12
+SUMMARY:⛵ Men's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2972,10 +2888,26 @@ SUMMARY:🏹 CHIU Yi-Ching 🇹🇼 - 🇯🇵 NODA Satsuki
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
 DTSTAMP:20240801T142400Z
 DTSTART:20240801T142400Z
 DTEND:20240801T144500Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2988,10 +2920,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -3004,10 +2936,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T155700Z
+DTSTART:20240801T155700Z
+DTEND:20240801T161800Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -3020,10 +2952,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T155700Z
-DTSTART:20240801T155700Z
-DTEND:20240801T161800Z
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
diff --git a/docs/general/KAZ.ics b/docs/general/KAZ.ics
index d77d7e88b..df41458bb 100644
--- a/docs/general/KAZ.ics
+++ b/docs/general/KAZ.ics
@@ -546,18 +546,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/KEN.ics b/docs/general/KEN.ics
index 839239fc3..2811714ca 100644
--- a/docs/general/KEN.ics
+++ b/docs/general/KEN.ics
@@ -62,19 +62,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/KGZ.ics b/docs/general/KGZ.ics
index c9662e422..51cdc8c68 100644
--- a/docs/general/KGZ.ics
+++ b/docs/general/KGZ.ics
@@ -17,18 +17,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/KOR.ics b/docs/general/KOR.ics
index f36dd6f7e..152600d2e 100644
--- a/docs/general/KOR.ics
+++ b/docs/general/KOR.ics
@@ -174,18 +174,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -212,19 +205,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -501,16 +487,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -553,22 +533,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -678,12 +649,9 @@ UID:20240728T184600Z-swimming-MENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T184600Z
 DTSTART:20240728T184600Z
 DTEND:20240728T190000Z
-DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇮🇹 Alessandro
-  RAGAINI\n🇱🇹 Danas RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧
-  Duncan SCOTT\n🇮🇹 Filippo MEGLI\n🇰🇷 HWANG Sunwoo\n🇰🇷 KIM
-  Woomin\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵
-  MATSUMOTO Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian
-  GIULIANI\n🇩🇪 Rafael MIROSLAW\n🇦🇺 Thomas NEILL
+DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹
+  LTU\n🇷🇴 ROU\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1357,16 +1325,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/KSA.ics b/docs/general/KSA.ics
index 5397ca309..e337220e6 100644
--- a/docs/general/KSA.ics
+++ b/docs/general/KSA.ics
@@ -17,18 +17,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/KUW.ics b/docs/general/KUW.ics
index d33896d13..efabc4046 100644
--- a/docs/general/KUW.ics
+++ b/docs/general/KUW.ics
@@ -50,18 +50,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/LAO.ics b/docs/general/LAO.ics
index bb5f3b115..f5e6d862d 100644
--- a/docs/general/LAO.ics
+++ b/docs/general/LAO.ics
@@ -17,18 +17,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -37,18 +30,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/LBA.ics b/docs/general/LBA.ics
index 4d8490b71..7d53a3883 100644
--- a/docs/general/LBA.ics
+++ b/docs/general/LBA.ics
@@ -73,18 +73,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/LBN.ics b/docs/general/LBN.ics
index bdf5611d0..a249564d6 100644
--- a/docs/general/LBN.ics
+++ b/docs/general/LBN.ics
@@ -35,18 +35,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/LTU.ics b/docs/general/LTU.ics
index 904ed9cc7..ab5e2c69d 100644
--- a/docs/general/LTU.ics
+++ b/docs/general/LTU.ics
@@ -44,18 +44,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -64,19 +57,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -128,16 +114,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -146,18 +126,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -175,12 +149,9 @@ UID:20240728T184600Z-swimming-MENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T184600Z
 DTSTART:20240728T184600Z
 DTEND:20240728T190000Z
-DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇮🇹 Alessandro
-  RAGAINI\n🇱🇹 Danas RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧
-  Duncan SCOTT\n🇮🇹 Filippo MEGLI\n🇰🇷 HWANG Sunwoo\n🇰🇷 KIM
-  Woomin\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵
-  MATSUMOTO Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian
-  GIULIANI\n🇩🇪 Rafael MIROSLAW\n🇦🇺 Thomas NEILL
+DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹
+  LTU\n🇷🇴 ROU\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -189,12 +160,9 @@ UID:20240728T191000Z-swimming-WOMENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240728T191000Z
 DTSTART:20240728T191000Z
 DTEND:20240728T192200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇬🇧 Angharad
-  EVANS\n🇮🇹 Benedetta PILATO\n🇪🇪 Eneli JEFIMOVA\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇦🇷 Macarena
-  CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI
-  Satomi\n🇸🇪 Sophie HANSSON\n🇨🇳 TANG Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱
-  Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇦🇷 ARG\n🇨🇳
+  CHN\n🇪🇪 EST\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱
+  NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -454,14 +422,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -476,10 +440,10 @@ SUMMARY:🚣 Women's Pair Semifinal A/B 2
 LOCATION:Nautical St - Flat water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -492,10 +456,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -508,10 +472,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -524,10 +488,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -540,22 +504,6 @@ SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T200500Z-3x3-basketball-MENS-POOL-ROUND-LTU-FRA
 DTSTAMP:20240731T200500Z
 DTSTART:20240731T200500Z
@@ -574,10 +522,26 @@ SUMMARY:🏀 LTU 🇱🇹 - 🇵🇱 POL
 LOCATION:La Concorde 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
 DTSTAMP:20240801T135300Z
 DTSTART:20240801T135300Z
 DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -590,10 +554,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -606,10 +570,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -622,10 +586,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T155700Z
+DTSTART:20240801T155700Z
+DTEND:20240801T161800Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -638,10 +602,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T155700Z
-DTSTART:20240801T155700Z
-DTEND:20240801T161800Z
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
diff --git a/docs/general/MAD.ics b/docs/general/MAD.ics
index 9a3101015..6014c355e 100644
--- a/docs/general/MAD.ics
+++ b/docs/general/MAD.ics
@@ -17,18 +17,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/MAR.ics b/docs/general/MAR.ics
index 6e163802a..16eeb922f 100644
--- a/docs/general/MAR.ics
+++ b/docs/general/MAR.ics
@@ -69,19 +69,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -205,18 +198,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/MAS.ics b/docs/general/MAS.ics
index 622a5e00d..3061473cd 100644
--- a/docs/general/MAS.ics
+++ b/docs/general/MAS.ics
@@ -94,19 +94,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -160,18 +153,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/MDA.ics b/docs/general/MDA.ics
index 524b80f8f..300ef9d9f 100644
--- a/docs/general/MDA.ics
+++ b/docs/general/MDA.ics
@@ -76,19 +76,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/MEX.ics b/docs/general/MEX.ics
index b39e3e6ff..33f2bdfc5 100644
--- a/docs/general/MEX.ics
+++ b/docs/general/MEX.ics
@@ -113,18 +113,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -251,16 +244,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -419,18 +406,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -823,19 +803,10 @@ SUMMARY:🏹 Hugo FRANCO 🇨🇺 - 🇲🇽 Bruno MARTINEZ WING
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T103600Z-boxing-WOMENS-75KG-PRELIMINARIES-ROUND-OF-16-AUS-MEX
-DTSTAMP:20240731T103600Z
-DTSTART:20240731T103600Z
-DTEND:20240731T104700Z
-DESCRIPTION:Boxing - Women's 75kg - Preliminaries - Round of 16
-SUMMARY:🥊 Caitlin PARKER 🇦🇺 - 🇲🇽 Citlalli Vanessa ORTIZ
-LOCATION:North Paris Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -849,10 +820,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -866,10 +837,19 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T103600Z-boxing-WOMENS-75KG-PRELIMINARIES-ROUND-OF-16-AUS-MEX
+DTSTAMP:20240731T103600Z
+DTSTART:20240731T103600Z
+DTEND:20240731T104700Z
+DESCRIPTION:Boxing - Women's 75kg - Preliminaries - Round of 16
+SUMMARY:🥊 Caitlin PARKER 🇦🇺 - 🇲🇽 Citlalli Vanessa ORTIZ
+LOCATION:North Paris Arena
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -883,10 +863,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -900,23 +880,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T192000Z-boxing-MENS-71KG-PRELIMINARIES-ROUND-OF-16-MOZ-MEX
 DTSTAMP:20240731T192000Z
 DTSTART:20240731T192000Z
@@ -985,10 +948,27 @@ SUMMARY:🏹 Jennifer MUCINO 🇺🇸 - 🇲🇽 Alejandra VALENCIA
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
 DTSTAMP:20240801T130300Z
 DTSTART:20240801T130300Z
 DTEND:20240801T132400Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1002,23 +982,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 14
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T134300Z-archery-MENS-INDIVIDUAL-132-ELIMINATION-ROUND-MEX-TUR
 DTSTAMP:20240801T134300Z
 DTSTART:20240801T134300Z
@@ -1037,10 +1000,27 @@ SUMMARY:🥊 Buse Naz CAKIROGLU 🇹🇷 - 🇲🇽 Fatima HERRERA
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
 DTSTAMP:20240801T140500Z
 DTSTART:20240801T140500Z
 DTEND:20240801T142600Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 14
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1054,10 +1034,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1071,10 +1051,19 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T152700Z-archery-WOMENS-INDIVIDUAL-132-ELIMINATION-ROUND-GER-ME
+DTSTAMP:20240801T152700Z
+DTSTART:20240801T152700Z
+DTEND:20240801T154000Z
+DESCRIPTION:Archery - Women's Individual 1/32 Elimination Round
+SUMMARY:🏹 Charline SCHWARZ 🇩🇪 - 🇲🇽 Ana VAZQUEZ
+LOCATION:Invalides
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1088,15 +1077,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152700Z-archery-WOMENS-INDIVIDUAL-132-ELIMINATION-ROUND-GER-ME
-DTSTAMP:20240801T152700Z
-DTSTART:20240801T152700Z
-DTEND:20240801T154000Z
-DESCRIPTION:Archery - Women's Individual 1/32 Elimination Round
-SUMMARY:🏹 Charline SCHWARZ 🇩🇪 - 🇲🇽 Ana VAZQUEZ
-LOCATION:Invalides
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
diff --git a/docs/general/MGL.ics b/docs/general/MGL.ics
index 1cde848c1..3ee9361f4 100644
--- a/docs/general/MGL.ics
+++ b/docs/general/MGL.ics
@@ -260,18 +260,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/MKD.ics b/docs/general/MKD.ics
index 682ed6f1f..818bc856d 100644
--- a/docs/general/MKD.ics
+++ b/docs/general/MKD.ics
@@ -17,19 +17,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/MON.ics b/docs/general/MON.ics
index 63bc0c86a..58a75afaa 100644
--- a/docs/general/MON.ics
+++ b/docs/general/MON.ics
@@ -51,17 +51,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/MOZ.ics b/docs/general/MOZ.ics
index f4bad299c..cf815c560 100644
--- a/docs/general/MOZ.ics
+++ b/docs/general/MOZ.ics
@@ -17,18 +17,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -64,18 +57,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/NCA.ics b/docs/general/NCA.ics
index 5a2b405d9..aa21d6cf9 100644
--- a/docs/general/NCA.ics
+++ b/docs/general/NCA.ics
@@ -30,18 +30,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/NED.ics b/docs/general/NED.ics
index 51477fc65..43c4e5208 100644
--- a/docs/general/NED.ics
+++ b/docs/general/NED.ics
@@ -171,18 +171,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -202,18 +195,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -233,27 +219,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -413,12 +382,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -436,11 +402,8 @@ UID:20240727T191200Z-swimming-MENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240727T191200Z
 DTSTART:20240727T191200Z
 DTEND:20240727T202600Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇬🇧 Adam
-  PEATY\n🇳🇱 Arno KAMMINGA\n🇦🇹 Bernhard REITSHAMMER\n🇳🇱 Caspar
-  CORBEAU\n🇺🇸 Charlie SWANSON\n🇬🇧 James WILBY\n🇦🇺 Joshua YONG\n🇩🇪
-  Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇩🇪 Melvin IMOUDU\n🇺🇸
-  Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN Haiyang\n🇮🇱 Ron POLONSKY
+DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇳🇱 NED\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -528,18 +491,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -548,22 +505,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -846,12 +794,9 @@ UID:20240728T191000Z-swimming-WOMENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240728T191000Z
 DTSTART:20240728T191000Z
 DTEND:20240728T192200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇬🇧 Angharad
-  EVANS\n🇮🇹 Benedetta PILATO\n🇪🇪 Eneli JEFIMOVA\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇦🇷 Macarena
-  CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI
-  Satomi\n🇸🇪 Sophie HANSSON\n🇨🇳 TANG Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱
-  Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇦🇷 ARG\n🇨🇳
+  CHN\n🇪🇪 EST\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱
+  NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -937,18 +882,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1217,12 +1155,9 @@ UID:20240729T190100Z-swimming-WOMENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240729T190100Z
 DTSTART:20240729T190100Z
 DTEND:20240729T191500Z
-DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇫🇷 Beryl
-  GASTALDELLO\n🇪🇸 Carmen WEILER SASTRE\n🇮🇪 Danielle HILL\n🇫🇷 Emma
-  TEREBO\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪
-  Louise HANSSON\n🇳🇱 Maaike de WAARD\n🇺🇸 Regan SMITH\n🇧🇪 Roos
-  VANOTTERDIJK\n🇨🇳 WAN Letian\n🇨🇳 WANG Xueer
+DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇮🇪 IRL\n🇳🇱 NED\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1870,14 +1805,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1886,33 +1817,45 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -1945,51 +1888,10 @@ SUMMARY:🏹 Quinty ROEFFEN 🇳🇱 - 🇦🇹 Elisabeth STRAKA
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120000Z-water-polo-WOMENS-PRELIMINARY-ROUND-GROUP-A-NED-AUS
-DTSTAMP:20240731T120000Z
-DTSTART:20240731T120000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Water Polo - Women's Preliminary Round - Group A
-SUMMARY:🤽 NED 🇳🇱 - 🇦🇺 AUS
-LOCATION:Aquatics Centre
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2002,10 +1904,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2018,10 +1920,19 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
+UID:20240731T120000Z-water-polo-WOMENS-PRELIMINARY-ROUND-GROUP-A-NED-AUS
+DTSTAMP:20240731T120000Z
+DTSTART:20240731T120000Z
 DTEND:20240731T132500Z
+DESCRIPTION:Water Polo - Women's Preliminary Round - Group A
+SUMMARY:🤽 NED 🇳🇱 - 🇦🇺 AUS
+LOCATION:Aquatics Centre
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
 DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
@@ -2033,19 +1944,51 @@ SUMMARY:⛵ Men's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2064,34 +2007,51 @@ SUMMARY:🛶 Women's Canoe Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
   LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
   McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
   FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
   SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
+SUMMARY:⛵ Men's Skiff - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2113,11 +2073,11 @@ SUMMARY:🏓 Britt EERLAND 🇳🇱 - 🇨🇳 CHEN Meng
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -2125,56 +2085,39 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
+SUMMARY:⛵ Men's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 9
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2203,40 +2146,6 @@ SUMMARY:🏑 GER 🇩🇪 - 🇳🇱 NED
 LOCATION:Yves-du-Manoir Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T163500Z-3x3-basketball-MENS-POOL-ROUND-LAT-NED
 DTSTAMP:20240731T163500Z
 DTSTART:20240731T163500Z
@@ -2246,23 +2155,6 @@ SUMMARY:🏀 LAT 🇱🇻 - 🇳🇱 NED
 LOCATION:La Concorde 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T181500Z-hockey-WOMENS-POOL-A-NED-CHN
 DTSTAMP:20240731T181500Z
 DTSTART:20240731T181500Z
@@ -2381,10 +2273,36 @@ SUMMARY:🏀 NED 🇳🇱 - 🇫🇷 FRA
 LOCATION:La Concorde 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
 DTSTAMP:20240801T130300Z
 DTSTART:20240801T130300Z
 DTEND:20240801T132400Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T133000Z-archery-MENS-INDIVIDUAL-132-ELIMINATION-ROUND-NED-ISR
+DTSTAMP:20240801T133000Z
+DTSTART:20240801T133000Z
+DTEND:20240801T134300Z
+DESCRIPTION:Archery - Men's Individual 1/32 Elimination Round
+SUMMARY:🏹 Steve WIJLER 🇳🇱 - 🇮🇱 Roy DROR
+LOCATION:Invalides
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -2398,19 +2316,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133000Z-archery-MENS-INDIVIDUAL-132-ELIMINATION-ROUND-NED-ISR
-DTSTAMP:20240801T133000Z
-DTSTART:20240801T133000Z
-DTEND:20240801T134300Z
-DESCRIPTION:Archery - Men's Individual 1/32 Elimination Round
-SUMMARY:🏹 Steve WIJLER 🇳🇱 - 🇮🇱 Roy DROR
-LOCATION:Invalides
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -2424,10 +2349,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2440,10 +2365,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -2457,10 +2382,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2473,10 +2398,19 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150000Z-volleyball-WOMENS-PRELIMINARY-ROUND-POOL-C-ITA-NED
+DTSTAMP:20240801T150000Z
+DTSTART:20240801T150000Z
+DTEND:20240801T171500Z
+DESCRIPTION:Volleyball - Women's Preliminary Round - Pool C
+SUMMARY:🏐 ITA 🇮🇹 - 🇳🇱 NED
+LOCATION:South Paris Arena 1
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -2490,10 +2424,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2506,19 +2440,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150000Z-volleyball-WOMENS-PRELIMINARY-ROUND-POOL-C-ITA-NED
-DTSTAMP:20240801T150000Z
-DTSTART:20240801T150000Z
-DTEND:20240801T171500Z
-DESCRIPTION:Volleyball - Women's Preliminary Round - Pool C
-SUMMARY:🏐 ITA 🇮🇹 - 🇳🇱 NED
-LOCATION:South Paris Arena 1
-END:VEVENT
-BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -2532,22 +2457,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -2565,11 +2474,11 @@ SUMMARY:⛵ Women's Windsurfing - Race 18
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -2577,7 +2486,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2598,6 +2507,22 @@ SUMMARY:⛵ Women's Windsurfing - Race 19
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/general/NEP.ics b/docs/general/NEP.ics
index e33a48e3d..826c1e5e0 100644
--- a/docs/general/NEP.ics
+++ b/docs/general/NEP.ics
@@ -59,18 +59,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/NOR.ics b/docs/general/NOR.ics
index 8fd9ec524..af5aeb95e 100644
--- a/docs/general/NOR.ics
+++ b/docs/general/NOR.ics
@@ -268,17 +268,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -681,67 +675,10 @@ SUMMARY:🚣 Men's Quadruple Sculls Final B
 LOCATION:Nautical St - Flat water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T102000Z-boxing-WOMENS-75KG-PRELIMINARIES-ROUND-OF-16-NOR-IND
-DTSTAMP:20240731T102000Z
-DTSTART:20240731T102000Z
-DTEND:20240731T103100Z
-DESCRIPTION:Boxing - Women's 75kg - Preliminaries - Round of 16
-SUMMARY:🥊 Sunniva HOFSTAD 🇳🇴 - 🇮🇳 Lovlina BORGOHAIN
-LOCATION:North Paris Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -755,10 +692,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -772,10 +709,19 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T102000Z-boxing-WOMENS-75KG-PRELIMINARIES-ROUND-OF-16-NOR-IND
+DTSTAMP:20240731T102000Z
+DTSTART:20240731T102000Z
+DTEND:20240731T103100Z
+DESCRIPTION:Boxing - Women's 75kg - Preliminaries - Round of 16
+SUMMARY:🥊 Sunniva HOFSTAD 🇳🇴 - 🇮🇳 Lovlina BORGOHAIN
+LOCATION:North Paris Arena
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -789,10 +735,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -806,20 +768,35 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 12
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -883,10 +860,27 @@ SUMMARY:🔫 50m Rifle 3 Positions Women's Qualification
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
 DTSTAMP:20240801T130300Z
 DTSTART:20240801T130300Z
 DTEND:20240801T132400Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -900,10 +894,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -917,10 +911,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -934,10 +928,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -951,10 +945,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
diff --git a/docs/general/NZL.ics b/docs/general/NZL.ics
index f90ce6fef..682ae8dd3 100644
--- a/docs/general/NZL.ics
+++ b/docs/general/NZL.ics
@@ -139,18 +139,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -159,14 +152,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -401,12 +390,9 @@ UID:20240728T091500Z-swimming-MENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240728T091500Z
 DTSTART:20240728T091500Z
 DTEND:20240728T092700Z
-DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇮🇹 Alberto
-  RAZZETTI\n🇬🇷 Apostolos PAPASTAMOS\n🇭🇺 Balazs HOLLO\n🇦🇺 Brendon
-  SMITH\n🇺🇸 Carson FOSTER\n🇩🇪 Cedric BUESSING\n🇺🇸 Chase KALISZ\n🇭🇺
-  Gabor ZOMBORI\n🇫🇷 Leon MARCHAND\n🇳🇿 Lewis CLAREBURT\n🇯🇵 MATSUSHITA
-  Tomoyuki\n🇬🇧 Max LITCHFIELD\n🇯🇵 SETO Daiya\n🇨🇦 Tristan
-  JANKOVICS\n🇦🇺 William Campbell PETRIC\n🇨🇳 ZHANG Zhanshuo
+DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇳🇿 NZL\n🇺🇸 USA
 SUMMARY:🏊 Men's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -427,22 +413,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -451,18 +428,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -691,13 +661,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1541,16 +1507,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1565,183 +1525,10 @@ SUMMARY:🚣 Lightweight Women's Double Sculls Semifinal A/B 1
 LOCATION:Nautical St - Flat water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 7
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1755,10 +1542,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1772,10 +1559,72 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 7
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
+DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1789,10 +1638,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1806,20 +1671,82 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 12
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -1911,11 +1838,11 @@ SUMMARY:🏊 Women's 4 x 200m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
 DTSTAMP:20240801T130300Z
 DTSTART:20240801T130300Z
 DTEND:20240801T132400Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
+DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
   SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
@@ -1924,7 +1851,7 @@ DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
   TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
   STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 13
+SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -1943,10 +1870,43 @@ SUMMARY:🛶 Men's Kayak Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
 DTSTAMP:20240801T133400Z
 DTSTART:20240801T133400Z
 DTEND:20240801T135500Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 13
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1960,10 +1920,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -1976,10 +1936,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1993,10 +1953,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2009,10 +1969,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -2026,10 +1986,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2042,10 +2002,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -2059,22 +2019,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -2092,11 +2036,11 @@ SUMMARY:⛵ Women's Windsurfing - Race 18
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -2104,7 +2048,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2125,6 +2069,22 @@ SUMMARY:⛵ Women's Windsurfing - Race 19
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/general/PAK.ics b/docs/general/PAK.ics
index 19d961099..16c27c61b 100644
--- a/docs/general/PAK.ics
+++ b/docs/general/PAK.ics
@@ -60,16 +60,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -78,18 +72,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/PAN.ics b/docs/general/PAN.ics
index d955a99f5..aaf6a7a13 100644
--- a/docs/general/PAN.ics
+++ b/docs/general/PAN.ics
@@ -17,18 +17,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/PAR.ics b/docs/general/PAR.ics
index 5d3807273..c938ee9cb 100644
--- a/docs/general/PAR.ics
+++ b/docs/general/PAR.ics
@@ -62,18 +62,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/PER.ics b/docs/general/PER.ics
index 7f7fdf915..a847519f2 100644
--- a/docs/general/PER.ics
+++ b/docs/general/PER.ics
@@ -39,19 +39,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -320,19 +313,10 @@ SUMMARY:🚣 Lightweight Women's Double Sculls Final C
 LOCATION:Nautical St - Flat water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T134000Z-badminton-WOMENS-SINGLES-GROUP-PLAY-STAGE-GROUP-J-JPN-
-DTSTAMP:20240731T134000Z
-DTSTART:20240731T134000Z
-DTEND:20240731T142000Z
-DESCRIPTION:Badminton - Women's Singles Group Play Stage - Group J
-SUMMARY:🏸 OHORI Aya 🇯🇵 - 🇵🇪 Ines Lucia CASTILLO
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -346,10 +330,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -363,10 +347,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -380,10 +364,19 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T134000Z-badminton-WOMENS-SINGLES-GROUP-PLAY-STAGE-GROUP-J-JPN-
+DTSTAMP:20240731T134000Z
+DTSTART:20240731T134000Z
+DTEND:20240731T142000Z
+DESCRIPTION:Badminton - Women's Singles Group Play Stage - Group J
+SUMMARY:🏸 OHORI Aya 🇯🇵 - 🇵🇪 Ines Lucia CASTILLO
+LOCATION:La Chapelle Arena
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -397,10 +390,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T130300Z
+DTSTART:20240801T130300Z
+DTEND:20240801T132400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -414,10 +407,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T130300Z
-DTSTART:20240801T130300Z
-DTEND:20240801T132400Z
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -431,10 +424,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -448,10 +441,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -465,10 +458,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -482,10 +475,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
diff --git a/docs/general/PLE.ics b/docs/general/PLE.ics
index 404102666..cd21dceb5 100644
--- a/docs/general/PLE.ics
+++ b/docs/general/PLE.ics
@@ -17,22 +17,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/POL.ics b/docs/general/POL.ics
index 779823d26..07d7df218 100644
--- a/docs/general/POL.ics
+++ b/docs/general/POL.ics
@@ -121,18 +121,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -159,27 +152,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -188,27 +164,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -506,18 +465,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -538,22 +491,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -777,12 +721,9 @@ UID:20240728T193200Z-swimming-MENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240728T193200Z
 DTSTART:20240728T193200Z
 DTEND:20240728T194400Z
-DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇬🇷 Apostolos
-  CHRISTOU\n🇨🇦 Blake TIERNEY\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert
-  KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇬🇧 Jonny
-  MARSHALL\n🇵🇱 Ksawery MASIUK\n🇫🇷 Mewen TOMAC\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇺🇸 Ryan MURPHY\n🇮🇹
-  Thomas CECCON\n🇨🇳 XU Jiayu\n🇫🇷 Yohann NDOYE-BROUARD
+DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹 ITA\n🇵🇱
+  POL\n🇿🇦 RSA\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -877,18 +818,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1743,16 +1677,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1767,19 +1695,37 @@ SUMMARY:🚣 Lightweight Women's Double Sculls Semifinal A/B 1
 LOCATION:Nautical St - Flat water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -1793,42 +1739,10 @@ SUMMARY:🚣 Men's Quadruple Sculls Final A
 LOCATION:Nautical St - Flat water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -1841,10 +1755,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -1857,10 +1771,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
 DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
@@ -1872,19 +1786,51 @@ SUMMARY:⛵ Men's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -1903,132 +1849,10 @@ SUMMARY:🛶 Women's Canoe Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T140000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-16-POL-TPE
-DTSTAMP:20240731T140000Z
-DTSTART:20240731T140000Z
-DTEND:20240731T150000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 16
-SUMMARY:🏓 Natalia BAJOR 🇵🇱 - 🇹🇼 CHENG I-Ching
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -2042,20 +1866,91 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 12
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T140000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-16-POL-TPE
+DTSTAMP:20240731T140000Z
+DTSTART:20240731T140000Z
+DTEND:20240731T150000Z
+DESCRIPTION:Table Tennis - Women's Singles Round of 16
+SUMMARY:🏓 Natalia BAJOR 🇵🇱 - 🇹🇼 CHENG I-Ching
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2199,11 +2094,11 @@ SUMMARY:🏀 LTU 🇱🇹 - 🇵🇱 POL
 LOCATION:La Concorde 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
 DTSTAMP:20240801T130300Z
 DTSTART:20240801T130300Z
 DTEND:20240801T132400Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
+DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
   SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
@@ -2212,7 +2107,7 @@ DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
   TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
   STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 13
+SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2231,10 +2126,43 @@ SUMMARY:🛶 Men's Kayak Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
 DTSTAMP:20240801T133400Z
 DTSTART:20240801T133400Z
 DTEND:20240801T135500Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 13
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -2248,10 +2176,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2264,10 +2192,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -2281,10 +2209,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2297,10 +2225,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -2314,10 +2242,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -2330,10 +2258,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -2347,22 +2275,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -2380,11 +2292,11 @@ SUMMARY:⛵ Women's Windsurfing - Race 18
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -2392,7 +2304,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -2413,6 +2325,22 @@ SUMMARY:⛵ Women's Windsurfing - Race 19
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/general/POR.ics b/docs/general/POR.ics
index 58344109b..008077e4b 100644
--- a/docs/general/POR.ics
+++ b/docs/general/POR.ics
@@ -143,22 +143,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/PUR.ics b/docs/general/PUR.ics
index 3eb21f4c2..9904f1f12 100644
--- a/docs/general/PUR.ics
+++ b/docs/general/PUR.ics
@@ -89,22 +89,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -194,16 +185,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/QAT.ics b/docs/general/QAT.ics
index b3622fdda..06c3b52d5 100644
--- a/docs/general/QAT.ics
+++ b/docs/general/QAT.ics
@@ -17,18 +17,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/ROU.ics b/docs/general/ROU.ics
index b3735e355..8a66c816f 100644
--- a/docs/general/ROU.ics
+++ b/docs/general/ROU.ics
@@ -197,16 +197,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -227,18 +221,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -294,12 +281,9 @@ UID:20240728T184600Z-swimming-MENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T184600Z
 DTSTART:20240728T184600Z
 DTEND:20240728T190000Z
-DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇮🇹 Alessandro
-  RAGAINI\n🇱🇹 Danas RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧
-  Duncan SCOTT\n🇮🇹 Filippo MEGLI\n🇰🇷 HWANG Sunwoo\n🇰🇷 KIM
-  Woomin\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵
-  MATSUMOTO Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian
-  GIULIANI\n🇩🇪 Rafael MIROSLAW\n🇦🇺 Thomas NEILL
+DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹
+  LTU\n🇷🇴 ROU\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -317,13 +301,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -351,17 +331,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/RSA.ics b/docs/general/RSA.ics
index 888c7907f..208b129db 100644
--- a/docs/general/RSA.ics
+++ b/docs/general/RSA.ics
@@ -134,18 +134,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -219,12 +212,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -292,18 +282,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -312,22 +296,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -352,18 +327,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -438,12 +406,9 @@ UID:20240728T191000Z-swimming-WOMENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240728T191000Z
 DTSTART:20240728T191000Z
 DTEND:20240728T192200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇬🇧 Angharad
-  EVANS\n🇮🇹 Benedetta PILATO\n🇪🇪 Eneli JEFIMOVA\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇦🇷 Macarena
-  CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI
-  Satomi\n🇸🇪 Sophie HANSSON\n🇨🇳 TANG Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱
-  Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇦🇷 ARG\n🇨🇳
+  CHN\n🇪🇪 EST\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱
+  NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -452,12 +417,9 @@ UID:20240728T193200Z-swimming-MENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240728T193200Z
 DTSTART:20240728T193200Z
 DTEND:20240728T194400Z
-DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇬🇷 Apostolos
-  CHRISTOU\n🇨🇦 Blake TIERNEY\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert
-  KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇬🇧 Jonny
-  MARSHALL\n🇵🇱 Ksawery MASIUK\n🇫🇷 Mewen TOMAC\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇺🇸 Ryan MURPHY\n🇮🇹
-  Thomas CECCON\n🇨🇳 XU Jiayu\n🇫🇷 Yohann NDOYE-BROUARD
+DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹 ITA\n🇵🇱
+  POL\n🇿🇦 RSA\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -466,13 +428,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -779,14 +737,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -795,16 +749,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/SEN.ics b/docs/general/SEN.ics
index ca135c551..2de85aa99 100644
--- a/docs/general/SEN.ics
+++ b/docs/general/SEN.ics
@@ -26,18 +26,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/SGP.ics b/docs/general/SGP.ics
index 6f929d3fc..d32ba51a1 100644
--- a/docs/general/SGP.ics
+++ b/docs/general/SGP.ics
@@ -127,18 +127,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -252,14 +246,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/SLO.ics b/docs/general/SLO.ics
index 72e49abe9..c87bddbf4 100644
--- a/docs/general/SLO.ics
+++ b/docs/general/SLO.ics
@@ -130,27 +130,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -283,16 +266,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -768,6 +745,57 @@ SUMMARY:🥋 Anka POGACNIK 🇸🇮 - 🇹🇩 Demos MEMNELOUM
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T133000Z-canoe-slalom-WOMENS-CANOE-SINGLE-SEMIFINAL
 DTSTAMP:20240731T133000Z
 DTSTART:20240731T133000Z
@@ -783,70 +811,10 @@ SUMMARY:🛶 Women's Canoe Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T140000Z-handball-MENS-PRELIMINARY-ROUND-GROUP-A-SLO-SWE
-DTSTAMP:20240731T140000Z
-DTSTART:20240731T140000Z
-DTEND:20240731T153000Z
-DESCRIPTION:Handball - Men's Preliminary Round Group A
-SUMMARY:🤾 SLO 🇸🇮 - 🇸🇪 SWE
-LOCATION:South Paris Arena 6
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -860,21 +828,13 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 12
-LOCATION:Marseille Marina
+UID:20240731T140000Z-handball-MENS-PRELIMINARY-ROUND-GROUP-A-SLO-SWE
+DTSTAMP:20240731T140000Z
+DTSTART:20240731T140000Z
+DTEND:20240731T153000Z
+DESCRIPTION:Handball - Men's Preliminary Round Group A
+SUMMARY:🤾 SLO 🇸🇮 - 🇸🇪 SWE
+LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
 UID:20240731T170300Z-archery-MENS-INDIVIDUAL-132-ELIMINATION-ROUND-SLO-ITA
@@ -895,11 +855,11 @@ SUMMARY:🥋 Metka LOBNIK 🇸🇮 - 🇽🇰 Loriana KUKA
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
 DTSTAMP:20240801T130300Z
 DTSTART:20240801T130300Z
 DTEND:20240801T132400Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
+DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
   SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
@@ -908,7 +868,7 @@ DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
   TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
   STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 13
+SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -927,10 +887,27 @@ SUMMARY:🛶 Men's Kayak Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
 DTSTAMP:20240801T133400Z
 DTSTART:20240801T133400Z
 DTEND:20240801T135500Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 13
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -944,10 +921,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -961,10 +938,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -978,10 +955,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
diff --git a/docs/general/SMR.ics b/docs/general/SMR.ics
index 76b64821a..22d38501d 100644
--- a/docs/general/SMR.ics
+++ b/docs/general/SMR.ics
@@ -47,19 +47,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/SRB.ics b/docs/general/SRB.ics
index 9a6e8bb81..0f9d3d8eb 100644
--- a/docs/general/SRB.ics
+++ b/docs/general/SRB.ics
@@ -88,27 +88,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -188,16 +171,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -333,12 +310,9 @@ UID:20240729T090000Z-swimming-WOMENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240729T090000Z
 DTSTART:20240729T090000Z
 DTEND:20240729T091200Z
-DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇮🇱
-  Anastasia GORBENKO\n🇷🇸 Anja CREVAR\n🇨🇦 Ella JANSEN\n🇦🇺 Ella
-  RAMSAY\n🇮🇪 Ellen WALSHE\n🇪🇸 Emma CARRASCO CADENS\n🇺🇸 Emma
-  WEYANT\n🇬🇧 Freya Constance COLBERT\n🇦🇺 Jenna FORRESTER\n🇺🇸 Katie
-  GRIMES\n🇬🇧 Katie SHANAHAN\n🇯🇵 NARITA Mio\n🇮🇹 Sara FRANCESCHI\n🇨🇦
-  Summer McINTOSH\n🇯🇵 TANIGAWA Ageha\n🇭🇺 Vivien JACKL
+DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵
+  JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -546,13 +520,9 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/SRI.ics b/docs/general/SRI.ics
index 6fd2708c3..c0e1f443e 100644
--- a/docs/general/SRI.ics
+++ b/docs/general/SRI.ics
@@ -26,18 +26,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/SUD.ics b/docs/general/SUD.ics
index 7212e427a..6806aa530 100644
--- a/docs/general/SUD.ics
+++ b/docs/general/SUD.ics
@@ -72,16 +72,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/SUI.ics b/docs/general/SUI.ics
index ccca61a8c..552435784 100644
--- a/docs/general/SUI.ics
+++ b/docs/general/SUI.ics
@@ -100,19 +100,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -308,16 +301,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -326,18 +313,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -355,22 +336,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1153,14 +1125,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1179,16 +1147,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1213,10 +1175,10 @@ SUMMARY:🚣 Women's Quadruple Sculls Final A
 LOCATION:Nautical St - Flat water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -1229,10 +1191,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -1245,10 +1207,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
 DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
@@ -1260,19 +1222,18 @@ SUMMARY:⛵ Men's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -1291,10 +1252,41 @@ SUMMARY:🛶 Women's Canoe Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -1307,52 +1299,6 @@ SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T153000Z-artistic-gymnastics-MENS-ALL-AROUND-FINAL
 DTSTAMP:20240731T153000Z
 DTSTART:20240731T153000Z
@@ -1470,10 +1416,26 @@ SUMMARY:🛶 Men's Kayak Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
 DTSTAMP:20240801T135300Z
 DTSTART:20240801T135300Z
 DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -1486,10 +1448,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -1502,10 +1464,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -1518,10 +1480,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T155700Z
+DTSTART:20240801T155700Z
+DTEND:20240801T161800Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -1534,10 +1496,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T155700Z
-DTSTART:20240801T155700Z
-DTEND:20240801T161800Z
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
diff --git a/docs/general/SVK.ics b/docs/general/SVK.ics
index 3760caecd..9d8cbcc16 100644
--- a/docs/general/SVK.ics
+++ b/docs/general/SVK.ics
@@ -541,10 +541,10 @@ SUMMARY:🔫 50m Rifle 3 Positions Men's Qualification
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -557,10 +557,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -573,22 +573,6 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T133000Z-canoe-slalom-WOMENS-CANOE-SINGLE-SEMIFINAL
 DTSTAMP:20240731T133000Z
 DTSTART:20240731T133000Z
@@ -604,10 +588,26 @@ SUMMARY:🛶 Women's Canoe Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -620,22 +620,6 @@ SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T161100Z-archery-WOMENS-INDIVIDUAL-132-ELIMINATION-ROUND-FRA-SV
 DTSTAMP:20240731T161100Z
 DTSTART:20240731T161100Z
@@ -692,10 +676,26 @@ SUMMARY:🛶 Men's Kayak Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
 DTSTAMP:20240801T135300Z
 DTSTART:20240801T135300Z
 DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -708,10 +708,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -724,10 +724,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -740,10 +740,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T155700Z
+DTSTART:20240801T155700Z
+DTEND:20240801T161800Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -756,10 +756,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T155700Z
-DTSTART:20240801T155700Z
-DTEND:20240801T161800Z
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
diff --git a/docs/general/SWE.ics b/docs/general/SWE.ics
index 30d604fe2..5d251504d 100644
--- a/docs/general/SWE.ics
+++ b/docs/general/SWE.ics
@@ -76,18 +76,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -105,19 +98,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -126,27 +112,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -164,27 +133,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -256,12 +208,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -354,18 +303,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -491,12 +434,9 @@ UID:20240728T191000Z-swimming-WOMENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240728T191000Z
 DTSTART:20240728T191000Z
 DTEND:20240728T192200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇬🇧 Angharad
-  EVANS\n🇮🇹 Benedetta PILATO\n🇪🇪 Eneli JEFIMOVA\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇦🇷 Macarena
-  CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI
-  Satomi\n🇸🇪 Sophie HANSSON\n🇨🇳 TANG Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱
-  Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇦🇷 ARG\n🇨🇳
+  CHN\n🇪🇪 EST\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱
+  NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -563,18 +503,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -583,17 +516,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -749,12 +676,9 @@ UID:20240729T190100Z-swimming-WOMENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240729T190100Z
 DTSTART:20240729T190100Z
 DTEND:20240729T191500Z
-DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇫🇷 Beryl
-  GASTALDELLO\n🇪🇸 Carmen WEILER SASTRE\n🇮🇪 Danielle HILL\n🇫🇷 Emma
-  TEREBO\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪
-  Louise HANSSON\n🇳🇱 Maaike de WAARD\n🇺🇸 Regan SMITH\n🇧🇪 Roos
-  VANOTTERDIJK\n🇨🇳 WAN Letian\n🇨🇳 WANG Xueer
+DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇮🇪 IRL\n🇳🇱 NED\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1143,14 +1067,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1164,67 +1084,10 @@ SUMMARY:🥋 Eduard TRIPPEL 🇩🇪 - 🇸🇪 Marcus NYMAN
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T140000Z-handball-MENS-PRELIMINARY-ROUND-GROUP-A-SLO-SWE
-DTSTAMP:20240731T140000Z
-DTSTART:20240731T140000Z
-DTEND:20240731T153000Z
-DESCRIPTION:Handball - Men's Preliminary Round Group A
-SUMMARY:🤾 SLO 🇸🇮 - 🇸🇪 SWE
-LOCATION:South Paris Arena 6
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1238,10 +1101,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1255,10 +1118,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1272,10 +1135,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1289,20 +1168,44 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 12
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T140000Z-handball-MENS-PRELIMINARY-ROUND-GROUP-A-SLO-SWE
+DTSTAMP:20240731T140000Z
+DTSTART:20240731T140000Z
+DTEND:20240731T153000Z
+DESCRIPTION:Handball - Men's Preliminary Round Group A
+SUMMARY:🤾 SLO 🇸🇮 - 🇸🇪 SWE
+LOCATION:South Paris Arena 6
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -1347,11 +1250,11 @@ SUMMARY:🏊 Men's 50m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
 DTSTAMP:20240801T130300Z
 DTSTART:20240801T130300Z
 DTEND:20240801T132400Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
+DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
   SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
@@ -1360,7 +1263,7 @@ DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
   TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
   STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 13
+SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -1379,10 +1282,27 @@ SUMMARY:🛶 Men's Kayak Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
 DTSTAMP:20240801T133400Z
 DTSTART:20240801T133400Z
 DTEND:20240801T135500Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 13
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1396,10 +1316,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1413,10 +1333,19 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150000Z-beach-volleyball-MENS-PRELIMINARY-PHASE-POOL-A-SWE-ITA
+DTSTAMP:20240801T150000Z
+DTSTART:20240801T150000Z
+DTEND:20240801T155000Z
+DESCRIPTION:Beach Volleyball - Men's Preliminary Phase - Pool A
+SUMMARY:🏐 AHMAN/HELLVIG 🇸🇪 - 🇮🇹 COTTAFAVA/NICOLAI
+LOCATION:Eiffel Tower Stadium
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -1430,19 +1359,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150000Z-beach-volleyball-MENS-PRELIMINARY-PHASE-POOL-A-SWE-ITA
-DTSTAMP:20240801T150000Z
-DTSTART:20240801T150000Z
-DTEND:20240801T155000Z
-DESCRIPTION:Beach Volleyball - Men's Preliminary Phase - Pool A
-SUMMARY:🏐 AHMAN/HELLVIG 🇸🇪 - 🇮🇹 COTTAFAVA/NICOLAI
-LOCATION:Eiffel Tower Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
diff --git a/docs/general/SWZ.ics b/docs/general/SWZ.ics
index 767e9c3f8..b93a68c9f 100644
--- a/docs/general/SWZ.ics
+++ b/docs/general/SWZ.ics
@@ -17,18 +17,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -37,18 +30,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/SYR.ics b/docs/general/SYR.ics
index e526181fd..31ccf70f7 100644
--- a/docs/general/SYR.ics
+++ b/docs/general/SYR.ics
@@ -17,16 +17,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/TGA.ics b/docs/general/TGA.ics
index f933d5d1c..d637fc078 100644
--- a/docs/general/TGA.ics
+++ b/docs/general/TGA.ics
@@ -26,22 +26,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/TKM.ics b/docs/general/TKM.ics
index 8260c2b7f..86d85affb 100644
--- a/docs/general/TKM.ics
+++ b/docs/general/TKM.ics
@@ -44,18 +44,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/TTO.ics b/docs/general/TTO.ics
index 5f343a46b..5c4c3ca4b 100644
--- a/docs/general/TTO.ics
+++ b/docs/general/TTO.ics
@@ -17,18 +17,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/TUN.ics b/docs/general/TUN.ics
index 4e76c8fbd..c0e514e31 100644
--- a/docs/general/TUN.ics
+++ b/docs/general/TUN.ics
@@ -70,19 +70,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -269,17 +262,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/TUR.ics b/docs/general/TUR.ics
index e2fcb7bdd..f8bbed27d 100644
--- a/docs/general/TUR.ics
+++ b/docs/general/TUR.ics
@@ -127,18 +127,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -271,22 +264,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -364,17 +348,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -697,10 +675,10 @@ SUMMARY:🥋 Mihael ZGANK 🇹🇷 - 🇦🇿 Eljan HAJIYEV
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -714,10 +692,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -731,10 +709,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -748,10 +726,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -765,23 +743,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T172900Z-archery-WOMENS-INDIVIDUAL-132-ELIMINATION-ROUND-TUR-MA
 DTSTAMP:20240731T172900Z
 DTSTART:20240731T172900Z
@@ -847,10 +808,27 @@ SUMMARY:🏊 Women's 4 x 200m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
 DTSTAMP:20240801T130300Z
 DTSTART:20240801T130300Z
 DTEND:20240801T132400Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -864,23 +842,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 14
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T134300Z-archery-MENS-INDIVIDUAL-132-ELIMINATION-ROUND-MEX-TUR
 DTSTAMP:20240801T134300Z
 DTSTART:20240801T134300Z
@@ -899,10 +860,27 @@ SUMMARY:🥊 Buse Naz CAKIROGLU 🇹🇷 - 🇲🇽 Fatima HERRERA
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
 DTSTAMP:20240801T140500Z
 DTSTART:20240801T140500Z
 DTEND:20240801T142600Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 14
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -916,10 +894,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -933,10 +911,19 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T152200Z-boxing-WOMENS-54KG-QUARTERFINAL-TUR-MGL
+DTSTAMP:20240801T152200Z
+DTSTART:20240801T152200Z
+DTEND:20240801T153300Z
+DESCRIPTION:Boxing - Women's 54kg - Quarterfinal
+SUMMARY:🥊 Hatice AKBAS 🇹🇷 - 🇲🇳 Enkhjargal MUNGUNTSETSEG
+LOCATION:North Paris Arena
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -950,15 +937,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152200Z-boxing-WOMENS-54KG-QUARTERFINAL-TUR-MGL
-DTSTAMP:20240801T152200Z
-DTSTART:20240801T152200Z
-DTEND:20240801T153300Z
-DESCRIPTION:Boxing - Women's 54kg - Quarterfinal
-SUMMARY:🥊 Hatice AKBAS 🇹🇷 - 🇲🇳 Enkhjargal MUNGUNTSETSEG
-LOCATION:North Paris Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
diff --git a/docs/general/UAE.ics b/docs/general/UAE.ics
index 6d769b058..e6465722d 100644
--- a/docs/general/UAE.ics
+++ b/docs/general/UAE.ics
@@ -44,18 +44,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/UKR.ics b/docs/general/UKR.ics
index 5c3092016..bb2d4f065 100644
--- a/docs/general/UKR.ics
+++ b/docs/general/UKR.ics
@@ -353,22 +353,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -530,18 +521,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -550,17 +534,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -901,16 +879,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/URU.ics b/docs/general/URU.ics
index c3b13c894..41514bb51 100644
--- a/docs/general/URU.ics
+++ b/docs/general/URU.ics
@@ -268,10 +268,10 @@ SUMMARY:⛵ Men's Skiff - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
 DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
@@ -283,10 +283,10 @@ SUMMARY:⛵ Men's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
 DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
@@ -298,10 +298,10 @@ SUMMARY:⛵ Men's Skiff - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
 DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
diff --git a/docs/general/USA.ics b/docs/general/USA.ics
index 4cf38fee1..d0970c7df 100644
--- a/docs/general/USA.ics
+++ b/docs/general/USA.ics
@@ -241,18 +241,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -261,14 +254,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -315,18 +304,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -344,19 +326,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -394,27 +369,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -423,27 +381,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -733,12 +674,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -780,11 +718,8 @@ UID:20240727T191200Z-swimming-MENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240727T191200Z
 DTSTART:20240727T191200Z
 DTEND:20240727T202600Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇬🇧 Adam
-  PEATY\n🇳🇱 Arno KAMMINGA\n🇦🇹 Bernhard REITSHAMMER\n🇳🇱 Caspar
-  CORBEAU\n🇺🇸 Charlie SWANSON\n🇬🇧 James WILBY\n🇦🇺 Joshua YONG\n🇩🇪
-  Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇩🇪 Melvin IMOUDU\n🇺🇸
-  Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN Haiyang\n🇮🇱 Ron POLONSKY
+DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇳🇱 NED\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1030,16 +965,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1073,12 +1002,9 @@ UID:20240728T091500Z-swimming-MENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240728T091500Z
 DTSTART:20240728T091500Z
 DTEND:20240728T092700Z
-DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇮🇹 Alberto
-  RAZZETTI\n🇬🇷 Apostolos PAPASTAMOS\n🇭🇺 Balazs HOLLO\n🇦🇺 Brendon
-  SMITH\n🇺🇸 Carson FOSTER\n🇩🇪 Cedric BUESSING\n🇺🇸 Chase KALISZ\n🇭🇺
-  Gabor ZOMBORI\n🇫🇷 Leon MARCHAND\n🇳🇿 Lewis CLAREBURT\n🇯🇵 MATSUSHITA
-  Tomoyuki\n🇬🇧 Max LITCHFIELD\n🇯🇵 SETO Daiya\n🇨🇦 Tristan
-  JANKOVICS\n🇦🇺 William Campbell PETRIC\n🇨🇳 ZHANG Zhanshuo
+DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇳🇿 NZL\n🇺🇸 USA
 SUMMARY:🏊 Men's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1096,18 +1022,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1137,22 +1057,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1186,18 +1097,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1571,12 +1475,9 @@ UID:20240728T184600Z-swimming-MENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T184600Z
 DTSTART:20240728T184600Z
 DTEND:20240728T190000Z
-DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇮🇹 Alessandro
-  RAGAINI\n🇱🇹 Danas RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧
-  Duncan SCOTT\n🇮🇹 Filippo MEGLI\n🇰🇷 HWANG Sunwoo\n🇰🇷 KIM
-  Woomin\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵
-  MATSUMOTO Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian
-  GIULIANI\n🇩🇪 Rafael MIROSLAW\n🇦🇺 Thomas NEILL
+DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹
+  LTU\n🇷🇴 ROU\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1603,12 +1504,9 @@ UID:20240728T191000Z-swimming-WOMENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240728T191000Z
 DTSTART:20240728T191000Z
 DTEND:20240728T192200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇬🇧 Angharad
-  EVANS\n🇮🇹 Benedetta PILATO\n🇪🇪 Eneli JEFIMOVA\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇦🇷 Macarena
-  CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI
-  Satomi\n🇸🇪 Sophie HANSSON\n🇨🇳 TANG Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱
-  Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇦🇷 ARG\n🇨🇳
+  CHN\n🇪🇪 EST\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱
+  NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1617,12 +1515,9 @@ UID:20240728T193200Z-swimming-MENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240728T193200Z
 DTSTART:20240728T193200Z
 DTEND:20240728T194400Z
-DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇬🇷 Apostolos
-  CHRISTOU\n🇨🇦 Blake TIERNEY\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert
-  KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇬🇧 Jonny
-  MARSHALL\n🇵🇱 Ksawery MASIUK\n🇫🇷 Mewen TOMAC\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇺🇸 Ryan MURPHY\n🇮🇹
-  Thomas CECCON\n🇨🇳 XU Jiayu\n🇫🇷 Yohann NDOYE-BROUARD
+DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹 ITA\n🇵🇱
+  POL\n🇿🇦 RSA\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1651,13 +1546,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1781,12 +1672,9 @@ UID:20240729T090000Z-swimming-WOMENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240729T090000Z
 DTSTART:20240729T090000Z
 DTEND:20240729T091200Z
-DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇮🇱
-  Anastasia GORBENKO\n🇷🇸 Anja CREVAR\n🇨🇦 Ella JANSEN\n🇦🇺 Ella
-  RAMSAY\n🇮🇪 Ellen WALSHE\n🇪🇸 Emma CARRASCO CADENS\n🇺🇸 Emma
-  WEYANT\n🇬🇧 Freya Constance COLBERT\n🇦🇺 Jenna FORRESTER\n🇺🇸 Katie
-  GRIMES\n🇬🇧 Katie SHANAHAN\n🇯🇵 NARITA Mio\n🇮🇹 Sara FRANCESCHI\n🇨🇦
-  Summer McINTOSH\n🇯🇵 TANIGAWA Ageha\n🇭🇺 Vivien JACKL
+DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵
+  JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1795,18 +1683,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1833,17 +1714,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -2363,12 +2238,9 @@ UID:20240729T190100Z-swimming-WOMENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240729T190100Z
 DTSTART:20240729T190100Z
 DTEND:20240729T191500Z
-DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇫🇷 Beryl
-  GASTALDELLO\n🇪🇸 Carmen WEILER SASTRE\n🇮🇪 Danielle HILL\n🇫🇷 Emma
-  TEREBO\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪
-  Louise HANSSON\n🇳🇱 Maaike de WAARD\n🇺🇸 Regan SMITH\n🇧🇪 Roos
-  VANOTTERDIJK\n🇨🇳 WAN Letian\n🇨🇳 WANG Xueer
+DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇮🇪 IRL\n🇳🇱 NED\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -3495,14 +3367,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -3521,16 +3389,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -3549,13 +3411,9 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -3578,6 +3436,40 @@ SUMMARY:🏓 Kanak JHA 🇺🇸 - 🇬🇷 Panagiotis GIONIS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T101400Z-rowing-WOMENS-QUADRUPLE-SCULLS-FINAL-B
 DTSTAMP:20240731T101400Z
 DTSTART:20240731T101400Z
@@ -3588,38 +3480,6 @@ SUMMARY:🚣 Women's Quadruple Sculls Final B
 LOCATION:Nautical St - Flat water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T111000Z-cycling-bmx-freestyle-WOMENS-PARK-FINAL
 DTSTAMP:20240731T111000Z
 DTSTART:20240731T111000Z
@@ -3650,26 +3510,10 @@ SUMMARY:🤺 USA 🇺🇸 - 🇮🇷 IRI
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -3682,10 +3526,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -3698,6 +3542,21 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
+DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T124445Z-cycling-bmx-freestyle-MENS-PARK-FINAL
 DTSTAMP:20240731T124445Z
 DTSTART:20240731T124445Z
@@ -3710,21 +3569,6 @@ SUMMARY:🚴 Men's Park Final
 LOCATION:La Concorde 2
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T130000Z-beach-volleyball-WOMENS-PRELIMINARY-PHASE-POOL-C-USA-F
 DTSTAMP:20240731T130000Z
 DTSTART:20240731T130000Z
@@ -3734,19 +3578,51 @@ SUMMARY:🏐 HUGHES/CHENG 🇺🇸 - 🇫🇷 VIEIRA/CHAMEREAU
 LOCATION:Eiffel Tower Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -3765,34 +3641,51 @@ SUMMARY:🛶 Women's Canoe Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
   LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
   McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
   FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
   SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
+SUMMARY:⛵ Men's Skiff - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -3805,11 +3698,11 @@ SUMMARY:🥊 Jahmal HARVEY 🇺🇸 - 🇧🇷 Luiz Gabriel OLIVEIRA
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -3817,39 +3710,39 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
+SUMMARY:⛵ Men's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 8
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -3862,23 +3755,6 @@ SUMMARY:🏐 USA 🇺🇸 - 🇷🇸 SRB
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T153000Z-artistic-gymnastics-MENS-ALL-AROUND-FINAL
 DTSTAMP:20240731T153000Z
 DTSTART:20240731T153000Z
@@ -3895,40 +3771,6 @@ SUMMARY:🤸 Men's All-Around Final
 LOCATION:Bercy Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T163000Z-water-polo-WOMENS-PRELIMINARY-ROUND-GROUP-B-ITA-USA
 DTSTAMP:20240731T163000Z
 DTSTART:20240731T163000Z
@@ -3938,23 +3780,6 @@ SUMMARY:🤽 ITA 🇮🇹 - 🇺🇸 USA
 LOCATION:Aquatics Centre
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T170000Z-football-WOMENS-GROUP-B-AUS-USA
 DTSTAMP:20240731T170000Z
 DTSTART:20240731T170000Z
@@ -4182,10 +4007,27 @@ SUMMARY:🏐 GEORGE/ANDRE 🇧🇷 - 🇺🇸 PARTAIN/BENESH
 LOCATION:Eiffel Tower Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
 DTSTAMP:20240801T130300Z
 DTSTART:20240801T130300Z
 DTEND:20240801T132400Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -4199,10 +4041,35 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140200Z-boxing-WOMENS-50KG-PRELIMINARIES-ROUND-OF-16-FIN-USA
+DTSTAMP:20240801T140200Z
+DTSTART:20240801T140200Z
+DTEND:20240801T141300Z
+DESCRIPTION:Boxing - Women's 50kg - Preliminaries - Round of 16
+SUMMARY:🥊 Pihla KAIVO-OJA 🇫🇮 - 🇺🇸 Jennifer LOZANO
+LOCATION:North Paris Arena
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -4216,10 +4083,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -4232,19 +4099,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140200Z-boxing-WOMENS-50KG-PRELIMINARIES-ROUND-OF-16-FIN-USA
-DTSTAMP:20240801T140200Z
-DTSTART:20240801T140200Z
-DTEND:20240801T141300Z
-DESCRIPTION:Boxing - Women's 50kg - Preliminaries - Round of 16
-SUMMARY:🥊 Pihla KAIVO-OJA 🇫🇮 - 🇺🇸 Jennifer LOZANO
-LOCATION:North Paris Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -4258,10 +4116,19 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145000Z-boxing-WOMENS-66KG-PRELIMINARIES-ROUND-OF-16-UZB-USA
+DTSTAMP:20240801T145000Z
+DTSTART:20240801T145000Z
+DTEND:20240801T150100Z
+DESCRIPTION:Boxing - Women's 66kg - Preliminaries - Round of 16
+SUMMARY:🥊 Navbakhor KHAMIDOVA 🇺🇿 - 🇺🇸 Morelle McCANE
+LOCATION:North Paris Arena
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -4274,10 +4141,19 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150000Z-hockey-WOMENS-POOL-B-USA-GBR
+DTSTAMP:20240801T150000Z
+DTSTART:20240801T150000Z
+DTEND:20240801T163000Z
+DESCRIPTION:Hockey - Women's Pool B
+SUMMARY:🏑 USA 🇺🇸 - 🇬🇧 GBR
+LOCATION:Yves-du-Manoir Stadium
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -4291,19 +4167,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145000Z-boxing-WOMENS-66KG-PRELIMINARIES-ROUND-OF-16-UZB-USA
-DTSTAMP:20240801T145000Z
-DTSTART:20240801T145000Z
-DTEND:20240801T150100Z
-DESCRIPTION:Boxing - Women's 66kg - Preliminaries - Round of 16
-SUMMARY:🥊 Navbakhor KHAMIDOVA 🇺🇿 - 🇺🇸 Morelle McCANE
-LOCATION:North Paris Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -4316,19 +4183,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150000Z-hockey-WOMENS-POOL-B-USA-GBR
-DTSTAMP:20240801T150000Z
-DTSTART:20240801T150000Z
-DTEND:20240801T163000Z
-DESCRIPTION:Hockey - Women's Pool B
-SUMMARY:🏑 USA 🇺🇸 - 🇬🇧 GBR
-LOCATION:Yves-du-Manoir Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -4342,22 +4200,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -4375,11 +4217,11 @@ SUMMARY:⛵ Women's Windsurfing - Race 18
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -4387,7 +4229,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -4408,6 +4250,22 @@ SUMMARY:⛵ Women's Windsurfing - Race 19
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/general/UZB.ics b/docs/general/UZB.ics
index 30aea74db..f5cf12620 100644
--- a/docs/general/UZB.ics
+++ b/docs/general/UZB.ics
@@ -116,14 +116,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -141,19 +137,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -303,17 +292,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/VEN.ics b/docs/general/VEN.ics
index 4759f27fc..a125da22a 100644
--- a/docs/general/VEN.ics
+++ b/docs/general/VEN.ics
@@ -17,19 +17,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -47,18 +40,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -131,17 +117,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/VIE.ics b/docs/general/VIE.ics
index 1aad2b66d..cf8a4fd22 100644
--- a/docs/general/VIE.ics
+++ b/docs/general/VIE.ics
@@ -194,17 +194,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/ZIM.ics b/docs/general/ZIM.ics
index 46e9c6adf..61daa97c6 100644
--- a/docs/general/ZIM.ics
+++ b/docs/general/ZIM.ics
@@ -72,16 +72,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/general/general.ics b/docs/general/general.ics
index a76101a30..9b5a849c0 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -1089,18 +1089,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1145,14 +1138,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1262,18 +1251,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1354,19 +1336,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1566,27 +1541,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -1613,27 +1571,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -3160,12 +3101,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -3361,11 +3299,8 @@ UID:20240727T191200Z-swimming-MENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240727T191200Z
 DTSTART:20240727T191200Z
 DTEND:20240727T202600Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇬🇧 Adam
-  PEATY\n🇳🇱 Arno KAMMINGA\n🇦🇹 Bernhard REITSHAMMER\n🇳🇱 Caspar
-  CORBEAU\n🇺🇸 Charlie SWANSON\n🇬🇧 James WILBY\n🇦🇺 Joshua YONG\n🇩🇪
-  Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇩🇪 Melvin IMOUDU\n🇺🇸
-  Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN Haiyang\n🇮🇱 Ron POLONSKY
+DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇳🇱 NED\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -4481,16 +4416,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -4560,12 +4489,9 @@ UID:20240728T091500Z-swimming-MENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240728T091500Z
 DTSTART:20240728T091500Z
 DTEND:20240728T092700Z
-DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇮🇹 Alberto
-  RAZZETTI\n🇬🇷 Apostolos PAPASTAMOS\n🇭🇺 Balazs HOLLO\n🇦🇺 Brendon
-  SMITH\n🇺🇸 Carson FOSTER\n🇩🇪 Cedric BUESSING\n🇺🇸 Chase KALISZ\n🇭🇺
-  Gabor ZOMBORI\n🇫🇷 Leon MARCHAND\n🇳🇿 Lewis CLAREBURT\n🇯🇵 MATSUSHITA
-  Tomoyuki\n🇬🇧 Max LITCHFIELD\n🇯🇵 SETO Daiya\n🇨🇦 Tristan
-  JANKOVICS\n🇦🇺 William Campbell PETRIC\n🇨🇳 ZHANG Zhanshuo
+DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇳🇿 NZL\n🇺🇸 USA
 SUMMARY:🏊 Men's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -4655,18 +4581,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -4795,22 +4715,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -4965,18 +4876,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -7191,12 +7095,9 @@ UID:20240728T184600Z-swimming-MENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T184600Z
 DTSTART:20240728T184600Z
 DTEND:20240728T190000Z
-DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇮🇹 Alessandro
-  RAGAINI\n🇱🇹 Danas RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧
-  Duncan SCOTT\n🇮🇹 Filippo MEGLI\n🇰🇷 HWANG Sunwoo\n🇰🇷 KIM
-  Woomin\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵
-  MATSUMOTO Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian
-  GIULIANI\n🇩🇪 Rafael MIROSLAW\n🇦🇺 Thomas NEILL
+DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹
+  LTU\n🇷🇴 ROU\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -7385,12 +7286,9 @@ UID:20240728T191000Z-swimming-WOMENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240728T191000Z
 DTSTART:20240728T191000Z
 DTEND:20240728T192200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇬🇧 Angharad
-  EVANS\n🇮🇹 Benedetta PILATO\n🇪🇪 Eneli JEFIMOVA\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇦🇷 Macarena
-  CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI
-  Satomi\n🇸🇪 Sophie HANSSON\n🇨🇳 TANG Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱
-  Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇦🇷 ARG\n🇨🇳
+  CHN\n🇪🇪 EST\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱
+  NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -7435,12 +7333,9 @@ UID:20240728T193200Z-swimming-MENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240728T193200Z
 DTSTART:20240728T193200Z
 DTEND:20240728T194400Z
-DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇬🇷 Apostolos
-  CHRISTOU\n🇨🇦 Blake TIERNEY\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert
-  KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇬🇧 Jonny
-  MARSHALL\n🇵🇱 Ksawery MASIUK\n🇫🇷 Mewen TOMAC\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇺🇸 Ryan MURPHY\n🇮🇹
-  Thomas CECCON\n🇨🇳 XU Jiayu\n🇫🇷 Yohann NDOYE-BROUARD
+DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹 ITA\n🇵🇱
+  POL\n🇿🇦 RSA\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -7478,13 +7373,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -8452,12 +8343,9 @@ UID:20240729T090000Z-swimming-WOMENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240729T090000Z
 DTSTART:20240729T090000Z
 DTEND:20240729T091200Z
-DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇮🇱
-  Anastasia GORBENKO\n🇷🇸 Anja CREVAR\n🇨🇦 Ella JANSEN\n🇦🇺 Ella
-  RAMSAY\n🇮🇪 Ellen WALSHE\n🇪🇸 Emma CARRASCO CADENS\n🇺🇸 Emma
-  WEYANT\n🇬🇧 Freya Constance COLBERT\n🇦🇺 Jenna FORRESTER\n🇺🇸 Katie
-  GRIMES\n🇬🇧 Katie SHANAHAN\n🇯🇵 NARITA Mio\n🇮🇹 Sara FRANCESCHI\n🇨🇦
-  Summer McINTOSH\n🇯🇵 TANIGAWA Ageha\n🇭🇺 Vivien JACKL
+DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵
+  JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -8538,18 +8426,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -8649,17 +8530,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -11041,12 +10916,9 @@ UID:20240729T190100Z-swimming-WOMENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240729T190100Z
 DTSTART:20240729T190100Z
 DTEND:20240729T191500Z
-DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇫🇷 Beryl
-  GASTALDELLO\n🇪🇸 Carmen WEILER SASTRE\n🇮🇪 Danielle HILL\n🇫🇷 Emma
-  TEREBO\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪
-  Louise HANSSON\n🇳🇱 Maaike de WAARD\n🇺🇸 Regan SMITH\n🇧🇪 Roos
-  VANOTTERDIJK\n🇨🇳 WAN Letian\n🇨🇳 WANG Xueer
+DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇮🇪 IRL\n🇳🇱 NED\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -14266,7 +14138,8 @@ UID:20240730T175500Z-archery-MENS-INDIVIDUAL-116-ELIMINATION-ROUND
 DTSTAMP:20240730T175500Z
 DTSTART:20240730T175500Z
 DTEND:20240730T180800Z
-DESCRIPTION:Archery - Men's Individual 1/16 Elimination Round
+DESCRIPTION:Archery - Men's Individual 1/16 Elimination Round\n🇨🇦 Eric
+  PETERS
 SUMMARY:🏹 Men's Individual 1/16 Elimination Round
 LOCATION:Invalides
 END:VEVENT
@@ -15396,14 +15269,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -15533,16 +15402,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -15664,13 +15527,9 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -15877,6 +15736,40 @@ SUMMARY:🏹 Oscar TICAS 🇸🇻 - 🇨🇳 WANG Yan
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T101400Z-rowing-WOMENS-QUADRUPLE-SCULLS-FINAL-B
 DTSTAMP:20240731T101400Z
 DTSTART:20240731T101400Z
@@ -15887,22 +15780,6 @@ SUMMARY:🚣 Women's Quadruple Sculls Final B
 LOCATION:Nautical St - Flat water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T101800Z-judo-MEN-90-KG-QUARTERFINAL
 DTSTAMP:20240731T101800Z
 DTSTART:20240731T101800Z
@@ -16022,22 +15899,6 @@ SUMMARY:🏹 Women's Individual 1/16 Elimination Round
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T110800Z-boxing-WOMENS-60KG-QUARTERFINAL-CHN-SRB
 DTSTAMP:20240731T110800Z
 DTSTART:20240731T110800Z
@@ -16131,6 +15992,38 @@ SUMMARY:🏹 Md Sagor ISLAM 🇧🇩 - 🇮🇹 Mauro NESPOLI
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 7
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T114400Z-archery-WOMENS-INDIVIDUAL-132-ELIMINATION-ROUND-ITA-MA
 DTSTAMP:20240731T114400Z
 DTSTART:20240731T114400Z
@@ -16149,22 +16042,6 @@ SUMMARY:🏹 Madalina AMAISTROAIE 🇷🇴 - 🇮🇱 Mikaella MOSHE
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T120000Z-badminton-MENS-DOUBLES-GROUP-PLAY-STAGE-GROUP-D-CHN-TP
 DTSTAMP:20240731T120000Z
 DTSTART:20240731T120000Z
@@ -16210,22 +16087,6 @@ SUMMARY:🤽 NED 🇳🇱 - 🇦🇺 AUS
 LOCATION:Aquatics Centre
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 7
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T121000Z-archery-MENS-INDIVIDUAL-116-ELIMINATION-ROUND
 DTSTAMP:20240731T121000Z
 DTSTART:20240731T121000Z
@@ -16235,6 +16096,21 @@ SUMMARY:🏹 Men's Individual 1/16 Elimination Round
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
+DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T122300Z-archery-WOMENS-INDIVIDUAL-116-ELIMINATION-ROUND
 DTSTAMP:20240731T122300Z
 DTSTART:20240731T122300Z
@@ -16244,22 +16120,6 @@ SUMMARY:🏹 Women's Individual 1/16 Elimination Round
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T123600Z-archery-MENS-INDIVIDUAL-132-ELIMINATION-ROUND-KOR-AUS
 DTSTAMP:20240731T123600Z
 DTSTART:20240731T123600Z
@@ -16317,21 +16177,6 @@ SUMMARY:🏸 TAI Tzu Ying 🇹🇼 - 🇹🇭 Ratchanok INTANON
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T130000Z-beach-volleyball-WOMENS-PRELIMINARY-PHASE-POOL-C-USA-F
 DTSTAMP:20240731T130000Z
 DTSTART:20240731T130000Z
@@ -16404,19 +16249,35 @@ SUMMARY:🏹 Marie HORACKOVA 🇨🇿 - 🇺🇿 Ziyodakhon ABDUSATTOROVA
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -16429,6 +16290,22 @@ SUMMARY:🏹 Jana ALI 🇪🇬 - 🇰🇷 NAM Suhyeon
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T132800Z-archery-MENS-INDIVIDUAL-116-ELIMINATION-ROUND
 DTSTAMP:20240731T132800Z
 DTSTART:20240731T132800Z
@@ -16480,22 +16357,6 @@ SUMMARY:🤽 CAN 🇨🇦 - 🇨🇳 CHN
 LOCATION:Aquatics Centre
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T134000Z-badminton-MENS-SINGLES-GROUP-PLAY-STAGE-GROUP-I-TPE-HK
 DTSTAMP:20240731T134000Z
 DTSTART:20240731T134000Z
@@ -16532,18 +16393,20 @@ SUMMARY:🏹 Women's Individual 1/16 Elimination Round
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -16574,6 +16437,37 @@ SUMMARY:🤺 Men's Sabre Team Semifinal 2
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T140000Z-beach-volleyball-MENS-PRELIMINARY-PHASE-POOL-B-NED-CHI
 DTSTAMP:20240731T140000Z
 DTSTART:20240731T140000Z
@@ -16655,22 +16549,6 @@ SUMMARY:🥋 Women -70 kg Repechage contest
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T141200Z-judo-WOMEN-70-KG-SEMIFINAL-OF-TABLE-B
 DTSTAMP:20240731T141200Z
 DTSTART:20240731T141200Z
@@ -16680,6 +16558,22 @@ SUMMARY:🥋 Women -70 kg Semifinal of Table B
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T141800Z-boxing-MENS-71KG-PRELIMINARIES-ROUND-OF-16-EGY-UZB
 DTSTAMP:20240731T141800Z
 DTSTART:20240731T141800Z
@@ -16743,6 +16637,22 @@ SUMMARY:🥊 Makan TRAORE 🇫🇷 - 🇩🇰 Nikolai TERTERYAN
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T143600Z-judo-MEN-90-KG-SEMIFINAL-OF-TABLE-B
 DTSTAMP:20240731T143600Z
 DTSTART:20240731T143600Z
@@ -16752,21 +16662,6 @@ SUMMARY:🥋 Men -90 kg Semifinal of Table B
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T144000Z-fencing-MENS-SABRE-TEAM-PLACEMENT-5-6
 DTSTAMP:20240731T144000Z
 DTSTART:20240731T144000Z
@@ -16794,6 +16689,22 @@ SUMMARY:🥋 Men -90 kg Semifinal of Table A
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T144800Z-judo-WOMEN-70-KG-CONTEST-FOR-BRONZE-MEDAL-A
 DTSTAMP:20240731T144800Z
 DTSTART:20240731T144800Z
@@ -16803,23 +16714,6 @@ SUMMARY:🥋 Women -70 kg Contest for Bronze Medal A
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T145000Z-boxing-MENS-71KG-PRELIMINARIES-ROUND-OF-16-JPN-JOR
 DTSTAMP:20240731T145000Z
 DTSTART:20240731T145000Z
@@ -16955,23 +16849,6 @@ SUMMARY:🥋 Men -90 kg Final
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T152200Z-boxing-WOMENS-75KG-PRELIMINARIES-ROUND-OF-16-THA-FRA
 DTSTAMP:20240731T152200Z
 DTSTART:20240731T152200Z
@@ -17051,23 +16928,6 @@ SUMMARY:🔫 50m Rifle 3 Positions Women's Pre-Event Training
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T155400Z-boxing-WOMENS-60KG-QUARTERFINAL-IRL-COL
 DTSTAMP:20240731T155400Z
 DTSTART:20240731T155400Z
@@ -17104,23 +16964,6 @@ SUMMARY:🏹 Amelie CORDEAU 🇫🇷 - 🇸🇰 Denisa BARANKOVA
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T162400Z-archery-WOMENS-INDIVIDUAL-132-ELIMINATION-ROUND-GBR-ES
 DTSTAMP:20240731T162400Z
 DTSTART:20240731T162400Z
@@ -17166,23 +17009,6 @@ SUMMARY:🏹 Women's Individual 1/16 Elimination Round
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T170000Z-football-WOMENS-GROUP-B-AUS-USA
 DTSTAMP:20240731T170000Z
 DTSTART:20240731T170000Z
@@ -19075,11 +18901,11 @@ SUMMARY:🤽 FRA 🇫🇷 - 🇦🇺 AUS
 LOCATION:Aquatics Centre
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
 DTSTAMP:20240801T130300Z
 DTSTART:20240801T130300Z
 DTEND:20240801T132400Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
+DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
   SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
@@ -19088,7 +18914,7 @@ DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
   TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
   STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 13
+SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -19125,11 +18951,11 @@ SUMMARY:🛶 Men's Kayak Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
 DTSTAMP:20240801T133400Z
 DTSTART:20240801T133400Z
 DTEND:20240801T135500Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
+DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
   SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
@@ -19138,7 +18964,7 @@ DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
   TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
   STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 14
+SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -19178,11 +19004,11 @@ SUMMARY:🥊 Buse Naz CAKIROGLU 🇹🇷 - 🇲🇽 Fatima HERRERA
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
 DTSTAMP:20240801T135300Z
 DTSTART:20240801T135300Z
 DTEND:20240801T141400Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -19190,7 +19016,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 12
+SUMMARY:⛵ Men's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -19266,11 +19092,11 @@ SUMMARY:🥊 Pihla KAIVO-OJA 🇫🇮 - 🇺🇸 Jennifer LOZANO
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
 DTSTAMP:20240801T140500Z
 DTSTART:20240801T140500Z
 DTEND:20240801T142600Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
+DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
   SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
@@ -19279,7 +19105,7 @@ DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
   TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
   STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 15
+SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -19346,11 +19172,11 @@ SUMMARY:🥋 Women -78 kg Repechage contest
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
 DTSTAMP:20240801T142400Z
 DTSTART:20240801T142400Z
 DTEND:20240801T144500Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -19358,7 +19184,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 13
+SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -19407,11 +19233,11 @@ SUMMARY:🥋 Women -78 kg Semifinal of Table B
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T143600Z
 DTSTART:20240801T143600Z
 DTEND:20240801T145700Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
+DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
   SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
@@ -19420,7 +19246,7 @@ DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
   TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
   STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 16
+SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -19478,11 +19304,11 @@ SUMMARY:🥋 Men -100 kg Contest for Bronze Medal B
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
 DTSTAMP:20240801T145500Z
 DTSTART:20240801T145500Z
 DTEND:20240801T151600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -19490,7 +19316,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 14
+SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -19566,11 +19392,11 @@ SUMMARY:🥋 Women -78 kg Contest for Bronze Medal A
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
 DTSTAMP:20240801T150700Z
 DTSTART:20240801T150700Z
 DTEND:20240801T152800Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
+DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
   SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
@@ -19579,7 +19405,7 @@ DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
   TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
   STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 17
+SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -19628,11 +19454,11 @@ SUMMARY:🥊 Hatice AKBAS 🇹🇷 - 🇲🇳 Enkhjargal MUNGUNTSETSEG
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
 DTSTAMP:20240801T152600Z
 DTSTART:20240801T152600Z
 DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -19640,7 +19466,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
+SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -19680,6 +19506,23 @@ SUMMARY:🥊 Richard KOVACS 🇭🇺 - 🇫🇷 Sofiane OUMIHA
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 17
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -19724,11 +19567,11 @@ SUMMARY:🥊 Aibek ORALBAY 🇰🇿 - 🇦🇿 Loren Berto ALFONSO DOMINGUEZ
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -19736,7 +19579,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -19793,6 +19636,22 @@ SUMMARY:🏹 Alexandr YEREMENKO 🇰🇿 - 🇫🇷 Baptiste ADDIS
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/sailing/ALG.ics b/docs/sailing/ALG.ics
index 352fb429f..765afca2a 100644
--- a/docs/sailing/ALG.ics
+++ b/docs/sailing/ALG.ics
@@ -100,10 +100,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 6
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -116,10 +116,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -132,10 +132,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -148,10 +148,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -164,10 +164,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -180,10 +180,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -196,10 +196,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -212,10 +212,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -228,10 +228,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T155700Z
+DTSTART:20240801T155700Z
+DTEND:20240801T161800Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -244,10 +244,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T155700Z
-DTSTART:20240801T155700Z
-DTEND:20240801T161800Z
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
diff --git a/docs/sailing/ARG.ics b/docs/sailing/ARG.ics
index b818bb949..c48ad2e08 100644
--- a/docs/sailing/ARG.ics
+++ b/docs/sailing/ARG.ics
@@ -219,90 +219,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 7
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -316,10 +236,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -333,10 +253,42 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 7
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -350,10 +302,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -367,10 +319,42 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T130300Z
+DTSTART:20240801T130300Z
+DTEND:20240801T132400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -384,10 +368,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T130300Z
-DTSTART:20240801T130300Z
-DTEND:20240801T132400Z
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -401,10 +385,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -418,10 +418,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -434,10 +434,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -451,10 +451,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -467,10 +467,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -484,10 +484,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -500,10 +500,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -517,22 +517,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -550,11 +534,11 @@ SUMMARY:⛵ Women's Windsurfing - Race 18
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -562,7 +546,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -583,6 +567,22 @@ SUMMARY:⛵ Women's Windsurfing - Race 19
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/sailing/ARU.ics b/docs/sailing/ARU.ics
index 71752fa32..94dc2a5d1 100644
--- a/docs/sailing/ARU.ics
+++ b/docs/sailing/ARU.ics
@@ -100,10 +100,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 6
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -116,10 +116,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -132,10 +132,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -148,10 +148,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -164,10 +164,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -180,10 +180,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -196,10 +196,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -212,10 +212,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -228,10 +228,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T155700Z
+DTSTART:20240801T155700Z
+DTEND:20240801T161800Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -244,10 +244,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T155700Z
-DTSTART:20240801T155700Z
-DTEND:20240801T161800Z
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
diff --git a/docs/sailing/AUS.ics b/docs/sailing/AUS.ics
index 9e564e5d6..edfad91d9 100644
--- a/docs/sailing/AUS.ics
+++ b/docs/sailing/AUS.ics
@@ -379,58 +379,10 @@ SUMMARY:⛵ Men's Skiff - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -443,10 +395,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -459,10 +411,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
 DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
@@ -474,10 +426,72 @@ SUMMARY:⛵ Men's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -490,10 +504,26 @@ SUMMARY:⛵ Men's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -506,25 +536,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -537,25 +552,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -568,10 +568,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -584,10 +584,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -600,10 +600,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T155700Z
+DTSTART:20240801T155700Z
+DTEND:20240801T161800Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -616,10 +616,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T155700Z
-DTSTART:20240801T155700Z
-DTEND:20240801T161800Z
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
diff --git a/docs/sailing/AUT.ics b/docs/sailing/AUT.ics
index 99426f90a..f44d0a3ce 100644
--- a/docs/sailing/AUT.ics
+++ b/docs/sailing/AUT.ics
@@ -258,55 +258,10 @@ SUMMARY:⛵ Men's Skiff - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -320,10 +275,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -337,10 +292,40 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
+DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -354,10 +339,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -371,10 +356,25 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T130300Z
+DTSTART:20240801T130300Z
+DTEND:20240801T132400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -388,10 +388,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T130300Z
-DTSTART:20240801T130300Z
-DTEND:20240801T132400Z
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -405,10 +405,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -422,10 +422,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -439,10 +439,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -456,10 +456,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
diff --git a/docs/sailing/BEL.ics b/docs/sailing/BEL.ics
index 0a91ceae6..b8e6d1b08 100644
--- a/docs/sailing/BEL.ics
+++ b/docs/sailing/BEL.ics
@@ -283,10 +283,40 @@ SUMMARY:⛵ Men's Skiff - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
+DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
 DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
   ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
   BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
@@ -299,10 +329,10 @@ SUMMARY:⛵ Women's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
 DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
   ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
   BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
@@ -315,10 +345,25 @@ SUMMARY:⛵ Women's Skiff - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
 DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
   ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
   BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
@@ -330,49 +375,4 @@ DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
 SUMMARY:⛵ Women's Skiff - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
-BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/sailing/BRA.ics b/docs/sailing/BRA.ics
index 11d5ef8ab..913aad609 100644
--- a/docs/sailing/BRA.ics
+++ b/docs/sailing/BRA.ics
@@ -379,58 +379,10 @@ SUMMARY:⛵ Men's Skiff - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -443,10 +395,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -459,10 +411,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
 DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
@@ -474,10 +426,72 @@ SUMMARY:⛵ Men's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -490,10 +504,26 @@ SUMMARY:⛵ Men's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -506,25 +536,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -537,25 +552,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -568,10 +568,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -584,10 +584,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -600,10 +600,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T155700Z
+DTSTART:20240801T155700Z
+DTEND:20240801T161800Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -616,10 +616,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T155700Z
-DTSTART:20240801T155700Z
-DTEND:20240801T161800Z
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
diff --git a/docs/sailing/CAN.ics b/docs/sailing/CAN.ics
index 69e684cfa..654240dee 100644
--- a/docs/sailing/CAN.ics
+++ b/docs/sailing/CAN.ics
@@ -283,10 +283,40 @@ SUMMARY:⛵ Men's Skiff - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
+DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
 DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
   ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
   BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
@@ -299,10 +329,10 @@ SUMMARY:⛵ Women's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
 DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
   ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
   BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
@@ -315,10 +345,25 @@ SUMMARY:⛵ Women's Skiff - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
 DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
   ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
   BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
@@ -330,49 +375,4 @@ DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
 SUMMARY:⛵ Women's Skiff - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
-BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/sailing/CHN.ics b/docs/sailing/CHN.ics
index 48d607c35..ad1dfd810 100644
--- a/docs/sailing/CHN.ics
+++ b/docs/sailing/CHN.ics
@@ -498,183 +498,10 @@ SUMMARY:⛵ Men's Skiff - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 7
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -688,10 +515,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -705,10 +532,72 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 7
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
+DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -722,10 +611,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -739,10 +644,89 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T130300Z
+DTSTART:20240801T130300Z
+DTEND:20240801T132400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -756,10 +740,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T130300Z
-DTSTART:20240801T130300Z
-DTEND:20240801T132400Z
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -773,10 +757,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -790,10 +790,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -806,10 +806,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -823,10 +823,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -839,10 +839,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -856,10 +856,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -872,10 +872,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -889,22 +889,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -922,11 +906,11 @@ SUMMARY:⛵ Women's Windsurfing - Race 18
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -934,7 +918,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -955,6 +939,22 @@ SUMMARY:⛵ Women's Windsurfing - Race 19
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/sailing/CRO.ics b/docs/sailing/CRO.ics
index 01100e0e2..4d447499b 100644
--- a/docs/sailing/CRO.ics
+++ b/docs/sailing/CRO.ics
@@ -258,55 +258,10 @@ SUMMARY:⛵ Men's Skiff - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -320,10 +275,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -337,10 +292,40 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
+DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -354,10 +339,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -371,10 +356,25 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T130300Z
+DTSTART:20240801T130300Z
+DTEND:20240801T132400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -388,10 +388,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T130300Z
-DTSTART:20240801T130300Z
-DTEND:20240801T132400Z
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -405,10 +405,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -422,10 +422,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -439,10 +439,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -456,10 +456,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
diff --git a/docs/sailing/CYP.ics b/docs/sailing/CYP.ics
index c6ccf1284..e29279662 100644
--- a/docs/sailing/CYP.ics
+++ b/docs/sailing/CYP.ics
@@ -123,10 +123,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -140,10 +140,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -157,10 +157,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -174,10 +174,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -191,10 +191,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T130300Z
+DTSTART:20240801T130300Z
+DTEND:20240801T132400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -208,10 +208,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T130300Z
-DTSTART:20240801T130300Z
-DTEND:20240801T132400Z
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -225,10 +225,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -242,10 +242,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -259,10 +259,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -276,10 +276,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
diff --git a/docs/sailing/CZE.ics b/docs/sailing/CZE.ics
index 47d4af965..e09a0b23c 100644
--- a/docs/sailing/CZE.ics
+++ b/docs/sailing/CZE.ics
@@ -267,58 +267,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -332,10 +284,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -349,10 +301,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -366,10 +318,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -383,10 +351,42 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T130300Z
+DTSTART:20240801T130300Z
+DTEND:20240801T132400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -400,10 +400,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T130300Z
-DTSTART:20240801T130300Z
-DTEND:20240801T132400Z
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -417,10 +417,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -434,10 +434,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -451,10 +451,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -468,10 +468,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
diff --git a/docs/sailing/DEN.ics b/docs/sailing/DEN.ics
index ada3fded6..f9e20ae53 100644
--- a/docs/sailing/DEN.ics
+++ b/docs/sailing/DEN.ics
@@ -379,58 +379,10 @@ SUMMARY:⛵ Men's Skiff - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -443,10 +395,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -459,10 +411,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
 DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
@@ -474,10 +426,72 @@ SUMMARY:⛵ Men's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -490,10 +504,26 @@ SUMMARY:⛵ Men's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -506,25 +536,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -537,25 +552,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -568,10 +568,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -584,10 +584,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -600,10 +600,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T155700Z
+DTSTART:20240801T155700Z
+DTEND:20240801T161800Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -616,10 +616,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T155700Z
-DTSTART:20240801T155700Z
-DTEND:20240801T161800Z
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
diff --git a/docs/sailing/ESP.ics b/docs/sailing/ESP.ics
index 5a6331144..a898340df 100644
--- a/docs/sailing/ESP.ics
+++ b/docs/sailing/ESP.ics
@@ -498,183 +498,10 @@ SUMMARY:⛵ Men's Skiff - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 7
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -688,10 +515,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -705,10 +532,72 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 7
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
+DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -722,10 +611,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -739,10 +644,89 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T130300Z
+DTSTART:20240801T130300Z
+DTEND:20240801T132400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -756,10 +740,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T130300Z
-DTSTART:20240801T130300Z
-DTEND:20240801T132400Z
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -773,10 +757,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -790,10 +790,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -806,10 +806,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -823,10 +823,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -839,10 +839,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -856,10 +856,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -872,10 +872,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -889,22 +889,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -922,11 +906,11 @@ SUMMARY:⛵ Women's Windsurfing - Race 18
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -934,7 +918,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -955,6 +939,22 @@ SUMMARY:⛵ Women's Windsurfing - Race 19
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/sailing/EST.ics b/docs/sailing/EST.ics
index fbdb26bf3..300025a5a 100644
--- a/docs/sailing/EST.ics
+++ b/docs/sailing/EST.ics
@@ -123,10 +123,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -140,10 +140,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -157,10 +157,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -174,10 +174,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -191,10 +191,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T130300Z
+DTSTART:20240801T130300Z
+DTEND:20240801T132400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -208,10 +208,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T130300Z
-DTSTART:20240801T130300Z
-DTEND:20240801T132400Z
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -225,10 +225,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -242,10 +242,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -259,10 +259,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -276,10 +276,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
diff --git a/docs/sailing/FIN.ics b/docs/sailing/FIN.ics
index 760eb9e69..a0de24f70 100644
--- a/docs/sailing/FIN.ics
+++ b/docs/sailing/FIN.ics
@@ -244,58 +244,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 6
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -308,10 +260,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -324,10 +276,42 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -340,10 +324,26 @@ SUMMARY:⛵ Men's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -356,10 +356,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -372,10 +372,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -388,10 +388,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -404,10 +404,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -420,10 +420,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T155700Z
+DTSTART:20240801T155700Z
+DTEND:20240801T161800Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -436,10 +436,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T155700Z
-DTSTART:20240801T155700Z
-DTEND:20240801T161800Z
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
diff --git a/docs/sailing/FRA.ics b/docs/sailing/FRA.ics
index b9030dbf2..3ee576845 100644
--- a/docs/sailing/FRA.ics
+++ b/docs/sailing/FRA.ics
@@ -498,183 +498,10 @@ SUMMARY:⛵ Men's Skiff - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 7
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -688,10 +515,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -705,10 +532,72 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 7
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
+DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -722,10 +611,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -739,10 +644,89 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T130300Z
+DTSTART:20240801T130300Z
+DTEND:20240801T132400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -756,10 +740,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T130300Z
-DTSTART:20240801T130300Z
-DTEND:20240801T132400Z
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -773,10 +757,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -790,10 +790,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -806,10 +806,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -823,10 +823,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -839,10 +839,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -856,10 +856,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -872,10 +872,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -889,22 +889,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -922,11 +906,11 @@ SUMMARY:⛵ Women's Windsurfing - Race 18
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -934,7 +918,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -955,6 +939,22 @@ SUMMARY:⛵ Women's Windsurfing - Race 19
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/sailing/GBR.ics b/docs/sailing/GBR.ics
index 37a126bdf..84d9e1899 100644
--- a/docs/sailing/GBR.ics
+++ b/docs/sailing/GBR.ics
@@ -498,183 +498,10 @@ SUMMARY:⛵ Men's Skiff - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 7
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -688,10 +515,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -705,10 +532,72 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 7
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
+DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -722,10 +611,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -739,10 +644,89 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T130300Z
+DTSTART:20240801T130300Z
+DTEND:20240801T132400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -756,10 +740,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T130300Z
-DTSTART:20240801T130300Z
-DTEND:20240801T132400Z
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -773,10 +757,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -790,10 +790,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -806,10 +806,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -823,10 +823,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -839,10 +839,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -856,10 +856,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -872,10 +872,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -889,22 +889,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -922,11 +906,11 @@ SUMMARY:⛵ Women's Windsurfing - Race 18
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -934,7 +918,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -955,6 +939,22 @@ SUMMARY:⛵ Women's Windsurfing - Race 19
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/sailing/GER.ics b/docs/sailing/GER.ics
index ec585dd13..bcf7bdb0f 100644
--- a/docs/sailing/GER.ics
+++ b/docs/sailing/GER.ics
@@ -498,183 +498,10 @@ SUMMARY:⛵ Men's Skiff - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 7
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -688,10 +515,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -705,10 +532,72 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 7
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
+DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -722,10 +611,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -739,10 +644,89 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T130300Z
+DTSTART:20240801T130300Z
+DTEND:20240801T132400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -756,10 +740,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T130300Z
-DTSTART:20240801T130300Z
-DTEND:20240801T132400Z
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -773,10 +757,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -790,10 +790,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -806,10 +806,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -823,10 +823,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -839,10 +839,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -856,10 +856,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -872,10 +872,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -889,22 +889,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -922,11 +906,11 @@ SUMMARY:⛵ Women's Windsurfing - Race 18
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -934,7 +918,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -955,6 +939,22 @@ SUMMARY:⛵ Women's Windsurfing - Race 19
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/sailing/GRE.ics b/docs/sailing/GRE.ics
index c15cae18d..f9775e4c3 100644
--- a/docs/sailing/GRE.ics
+++ b/docs/sailing/GRE.ics
@@ -100,10 +100,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 6
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -116,10 +116,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -132,10 +132,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -148,10 +148,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -164,10 +164,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -180,10 +180,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -196,10 +196,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -212,10 +212,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -228,10 +228,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T155700Z
+DTSTART:20240801T155700Z
+DTEND:20240801T161800Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -244,10 +244,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T155700Z
-DTSTART:20240801T155700Z
-DTEND:20240801T161800Z
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
diff --git a/docs/sailing/HKG.ics b/docs/sailing/HKG.ics
index 9a91d639e..08fdf464b 100644
--- a/docs/sailing/HKG.ics
+++ b/docs/sailing/HKG.ics
@@ -354,135 +354,10 @@ SUMMARY:⛵ Men's Skiff - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 7
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -496,10 +371,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -513,10 +388,72 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 7
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
+DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -530,10 +467,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -547,10 +484,57 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T130300Z
+DTSTART:20240801T130300Z
+DTEND:20240801T132400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -564,10 +548,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T130300Z
-DTSTART:20240801T130300Z
-DTEND:20240801T132400Z
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -581,10 +565,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -598,10 +598,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -614,10 +614,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -631,10 +631,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -647,10 +647,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -664,10 +664,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -680,10 +680,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -697,22 +697,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -730,11 +714,11 @@ SUMMARY:⛵ Women's Windsurfing - Race 18
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -742,7 +726,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -763,6 +747,22 @@ SUMMARY:⛵ Women's Windsurfing - Race 19
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/sailing/IRL.ics b/docs/sailing/IRL.ics
index 8a8a01d5a..70c572986 100644
--- a/docs/sailing/IRL.ics
+++ b/docs/sailing/IRL.ics
@@ -139,10 +139,10 @@ SUMMARY:⛵ Men's Skiff - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
 DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
@@ -154,10 +154,10 @@ SUMMARY:⛵ Men's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
 DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
@@ -169,10 +169,10 @@ SUMMARY:⛵ Men's Skiff - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
 DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
diff --git a/docs/sailing/ISR.ics b/docs/sailing/ISR.ics
index cb6da9a5b..213480857 100644
--- a/docs/sailing/ISR.ics
+++ b/docs/sailing/ISR.ics
@@ -219,90 +219,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 7
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -316,10 +236,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -333,10 +253,42 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 7
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -350,10 +302,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -367,10 +319,42 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T130300Z
+DTSTART:20240801T130300Z
+DTEND:20240801T132400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -384,10 +368,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T130300Z
-DTSTART:20240801T130300Z
-DTEND:20240801T132400Z
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -401,10 +385,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -418,10 +418,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -434,10 +434,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -451,10 +451,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -467,10 +467,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -484,10 +484,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -500,10 +500,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -517,22 +517,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -550,11 +534,11 @@ SUMMARY:⛵ Women's Windsurfing - Race 18
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -562,7 +546,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -583,6 +567,22 @@ SUMMARY:⛵ Women's Windsurfing - Race 19
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/sailing/ITA.ics b/docs/sailing/ITA.ics
index 1ae9d5fac..811f2b75a 100644
--- a/docs/sailing/ITA.ics
+++ b/docs/sailing/ITA.ics
@@ -363,138 +363,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 7
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -508,10 +380,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -525,10 +397,42 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 7
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -542,10 +446,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -559,10 +479,74 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T130300Z
+DTSTART:20240801T130300Z
+DTEND:20240801T132400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -576,10 +560,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T130300Z
-DTSTART:20240801T130300Z
-DTEND:20240801T132400Z
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -593,10 +577,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -610,10 +610,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -626,10 +626,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -643,10 +643,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -659,10 +659,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -676,10 +676,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -692,10 +692,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -709,22 +709,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -742,11 +726,11 @@ SUMMARY:⛵ Women's Windsurfing - Race 18
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -754,7 +738,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -775,6 +759,22 @@ SUMMARY:⛵ Women's Windsurfing - Race 19
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/sailing/JPN.ics b/docs/sailing/JPN.ics
index ff562e6c0..7ca367a0c 100644
--- a/docs/sailing/JPN.ics
+++ b/docs/sailing/JPN.ics
@@ -244,58 +244,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 6
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -308,10 +260,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -324,10 +276,42 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -340,10 +324,26 @@ SUMMARY:⛵ Men's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -356,10 +356,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -372,10 +372,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -388,10 +388,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -404,10 +404,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -420,10 +420,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T155700Z
+DTSTART:20240801T155700Z
+DTEND:20240801T161800Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -436,10 +436,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T155700Z
-DTSTART:20240801T155700Z
-DTEND:20240801T161800Z
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
diff --git a/docs/sailing/LTU.ics b/docs/sailing/LTU.ics
index 8d2a32269..1492c8575 100644
--- a/docs/sailing/LTU.ics
+++ b/docs/sailing/LTU.ics
@@ -100,10 +100,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 6
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -116,10 +116,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -132,10 +132,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -148,10 +148,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -164,10 +164,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -180,10 +180,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -196,10 +196,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -212,10 +212,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -228,10 +228,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T155700Z
+DTSTART:20240801T155700Z
+DTEND:20240801T161800Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -244,10 +244,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T155700Z
-DTSTART:20240801T155700Z
-DTEND:20240801T161800Z
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
diff --git a/docs/sailing/MEX.ics b/docs/sailing/MEX.ics
index 8efa0f8ff..e08c3064a 100644
--- a/docs/sailing/MEX.ics
+++ b/docs/sailing/MEX.ics
@@ -123,10 +123,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -140,10 +140,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -157,10 +157,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -174,10 +174,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -191,10 +191,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T130300Z
+DTSTART:20240801T130300Z
+DTEND:20240801T132400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -208,10 +208,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T130300Z
-DTSTART:20240801T130300Z
-DTEND:20240801T132400Z
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -225,10 +225,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -242,10 +242,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -259,10 +259,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -276,10 +276,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
diff --git a/docs/sailing/NED.ics b/docs/sailing/NED.ics
index f57cd5675..f54b2fe67 100644
--- a/docs/sailing/NED.ics
+++ b/docs/sailing/NED.ics
@@ -498,183 +498,10 @@ SUMMARY:⛵ Men's Skiff - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 7
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -688,10 +515,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -705,10 +532,72 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 7
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
+DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -722,10 +611,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -739,10 +644,89 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T130300Z
+DTSTART:20240801T130300Z
+DTEND:20240801T132400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -756,10 +740,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T130300Z
-DTSTART:20240801T130300Z
-DTEND:20240801T132400Z
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -773,10 +757,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -790,10 +790,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -806,10 +806,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -823,10 +823,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -839,10 +839,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -856,10 +856,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -872,10 +872,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -889,22 +889,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -922,11 +906,11 @@ SUMMARY:⛵ Women's Windsurfing - Race 18
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -934,7 +918,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -955,6 +939,22 @@ SUMMARY:⛵ Women's Windsurfing - Race 19
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/sailing/NOR.ics b/docs/sailing/NOR.ics
index 4f77cd257..11083bf17 100644
--- a/docs/sailing/NOR.ics
+++ b/docs/sailing/NOR.ics
@@ -267,58 +267,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -332,10 +284,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -349,10 +301,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -366,10 +318,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -383,10 +351,42 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T130300Z
+DTSTART:20240801T130300Z
+DTEND:20240801T132400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -400,10 +400,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T130300Z
-DTSTART:20240801T130300Z
-DTEND:20240801T132400Z
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -417,10 +417,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -434,10 +434,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -451,10 +451,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -468,10 +468,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
diff --git a/docs/sailing/NZL.ics b/docs/sailing/NZL.ics
index bf54d835a..9f385104a 100644
--- a/docs/sailing/NZL.ics
+++ b/docs/sailing/NZL.ics
@@ -498,183 +498,10 @@ SUMMARY:⛵ Men's Skiff - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 7
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -688,10 +515,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -705,10 +532,72 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 7
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
+DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -722,10 +611,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -739,10 +644,89 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T130300Z
+DTSTART:20240801T130300Z
+DTEND:20240801T132400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -756,10 +740,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T130300Z
-DTSTART:20240801T130300Z
-DTEND:20240801T132400Z
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -773,10 +757,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -790,10 +790,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -806,10 +806,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -823,10 +823,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -839,10 +839,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -856,10 +856,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -872,10 +872,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -889,22 +889,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -922,11 +906,11 @@ SUMMARY:⛵ Women's Windsurfing - Race 18
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -934,7 +918,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -955,6 +939,22 @@ SUMMARY:⛵ Women's Windsurfing - Race 19
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/sailing/PER.ics b/docs/sailing/PER.ics
index d52a5ea2e..d5bc88c2f 100644
--- a/docs/sailing/PER.ics
+++ b/docs/sailing/PER.ics
@@ -123,10 +123,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -140,10 +140,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -157,10 +157,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -174,10 +174,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -191,10 +191,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T130300Z
+DTSTART:20240801T130300Z
+DTEND:20240801T132400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -208,10 +208,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T130300Z
-DTSTART:20240801T130300Z
-DTEND:20240801T132400Z
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -225,10 +225,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -242,10 +242,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -259,10 +259,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -276,10 +276,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
diff --git a/docs/sailing/POL.ics b/docs/sailing/POL.ics
index 4b0453713..b9ea085b8 100644
--- a/docs/sailing/POL.ics
+++ b/docs/sailing/POL.ics
@@ -498,183 +498,10 @@ SUMMARY:⛵ Men's Skiff - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 7
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -688,10 +515,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -705,10 +532,72 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 7
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
+DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -722,10 +611,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -739,10 +644,89 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T130300Z
+DTSTART:20240801T130300Z
+DTEND:20240801T132400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -756,10 +740,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T130300Z
-DTSTART:20240801T130300Z
-DTEND:20240801T132400Z
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -773,10 +757,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -790,10 +790,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -806,10 +806,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -823,10 +823,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -839,10 +839,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -856,10 +856,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -872,10 +872,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -889,22 +889,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -922,11 +906,11 @@ SUMMARY:⛵ Women's Windsurfing - Race 18
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -934,7 +918,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -955,6 +939,22 @@ SUMMARY:⛵ Women's Windsurfing - Race 19
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/sailing/SLO.ics b/docs/sailing/SLO.ics
index 8639364ad..2d0c3b463 100644
--- a/docs/sailing/SLO.ics
+++ b/docs/sailing/SLO.ics
@@ -123,10 +123,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -140,10 +140,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -157,10 +157,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -174,10 +174,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -191,10 +191,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T130300Z
+DTSTART:20240801T130300Z
+DTEND:20240801T132400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -208,10 +208,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T130300Z
-DTSTART:20240801T130300Z
-DTEND:20240801T132400Z
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -225,10 +225,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -242,10 +242,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -259,10 +259,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -276,10 +276,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
diff --git a/docs/sailing/SUI.ics b/docs/sailing/SUI.ics
index 0367a28d6..c3fb11fbe 100644
--- a/docs/sailing/SUI.ics
+++ b/docs/sailing/SUI.ics
@@ -235,10 +235,10 @@ SUMMARY:⛵ Men's Skiff - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -251,10 +251,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -267,10 +267,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
 DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
@@ -282,10 +282,40 @@ SUMMARY:⛵ Men's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -298,10 +328,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -314,25 +344,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -345,25 +360,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -376,10 +376,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -392,10 +392,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -408,10 +408,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T155700Z
+DTSTART:20240801T155700Z
+DTEND:20240801T161800Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -424,10 +424,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T155700Z
-DTSTART:20240801T155700Z
-DTEND:20240801T161800Z
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
diff --git a/docs/sailing/SVK.ics b/docs/sailing/SVK.ics
index 8be9b0bff..e6ba67f83 100644
--- a/docs/sailing/SVK.ics
+++ b/docs/sailing/SVK.ics
@@ -100,10 +100,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 6
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -116,10 +116,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -132,10 +132,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -148,10 +148,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -164,10 +164,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -180,10 +180,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -196,10 +196,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -212,10 +212,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -228,10 +228,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T155700Z
+DTSTART:20240801T155700Z
+DTEND:20240801T161800Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -244,10 +244,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T155700Z
-DTSTART:20240801T155700Z
-DTEND:20240801T161800Z
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
diff --git a/docs/sailing/SWE.ics b/docs/sailing/SWE.ics
index 5e6669bb5..1d1e71a02 100644
--- a/docs/sailing/SWE.ics
+++ b/docs/sailing/SWE.ics
@@ -267,58 +267,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -332,10 +284,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -349,10 +301,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -366,10 +318,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -383,10 +351,42 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T130300Z
+DTSTART:20240801T130300Z
+DTEND:20240801T132400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -400,10 +400,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T130300Z
-DTSTART:20240801T130300Z
-DTEND:20240801T132400Z
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -417,10 +417,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -434,10 +434,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -451,10 +451,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -468,10 +468,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
diff --git a/docs/sailing/TUR.ics b/docs/sailing/TUR.ics
index 5900f8b5f..0606f19f3 100644
--- a/docs/sailing/TUR.ics
+++ b/docs/sailing/TUR.ics
@@ -123,10 +123,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -140,10 +140,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -157,10 +157,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -174,10 +174,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -191,10 +191,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T130300Z
+DTSTART:20240801T130300Z
+DTEND:20240801T132400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -208,10 +208,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T130300Z
-DTSTART:20240801T130300Z
-DTEND:20240801T132400Z
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -225,10 +225,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -242,10 +242,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -259,10 +259,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -276,10 +276,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
diff --git a/docs/sailing/URU.ics b/docs/sailing/URU.ics
index 45d86b93a..8cec9da1f 100644
--- a/docs/sailing/URU.ics
+++ b/docs/sailing/URU.ics
@@ -139,10 +139,10 @@ SUMMARY:⛵ Men's Skiff - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
 DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
@@ -154,10 +154,10 @@ SUMMARY:⛵ Men's Skiff - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
 DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
@@ -169,10 +169,10 @@ SUMMARY:⛵ Men's Skiff - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
 DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
   BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
   BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
diff --git a/docs/sailing/USA.ics b/docs/sailing/USA.ics
index fae4c0b06..763153960 100644
--- a/docs/sailing/USA.ics
+++ b/docs/sailing/USA.ics
@@ -498,183 +498,10 @@ SUMMARY:⛵ Men's Skiff - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 7
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -688,10 +515,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -705,10 +532,72 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 7
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
+DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -722,10 +611,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -739,10 +644,89 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T130300Z
+DTSTART:20240801T130300Z
+DTEND:20240801T132400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -756,10 +740,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T130300Z
-DTSTART:20240801T130300Z
-DTEND:20240801T132400Z
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -773,10 +757,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
+DTSTAMP:20240801T135300Z
+DTSTART:20240801T135300Z
+DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -790,10 +790,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
-DTSTAMP:20240801T135300Z
-DTSTART:20240801T135300Z
-DTEND:20240801T141400Z
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -806,10 +806,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -823,10 +823,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -839,10 +839,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -856,10 +856,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -872,10 +872,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -889,22 +889,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -922,11 +906,11 @@ SUMMARY:⛵ Women's Windsurfing - Race 18
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -934,7 +918,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -955,6 +939,22 @@ SUMMARY:⛵ Women's Windsurfing - Race 19
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/sailing/general.ics b/docs/sailing/general.ics
index a0f5d9393..ca796719f 100644
--- a/docs/sailing/general.ics
+++ b/docs/sailing/general.ics
@@ -498,183 +498,10 @@ SUMMARY:⛵ Men's Skiff - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T101500Z-sailing-WOMENS-SKIFF-RACE-10
-DTSTAMP:20240731T101500Z
-DTSTART:20240731T101500Z
-DTEND:20240731T105000Z
-DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T110700Z-sailing-WOMENS-SKIFF-RACE-11
-DTSTAMP:20240731T110700Z
-DTSTART:20240731T110700Z
-DTEND:20240731T114200Z
-DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T115900Z-sailing-WOMENS-SKIFF-RACE-12
-DTSTAMP:20240731T115900Z
-DTSTART:20240731T115900Z
-DTEND:20240731T123400Z
-DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
-  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
-  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
-  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
-  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
-  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
-  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
-  TANAKA/NAGAMATSU
-SUMMARY:⛵ Women's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
-DTSTAMP:20240731T120300Z
-DTSTART:20240731T120300Z
-DTEND:20240731T122400Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 7
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T123400Z-sailing-MENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T123400Z
-DTSTART:20240731T123400Z
-DTEND:20240731T125500Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 8
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T125000Z-sailing-MENS-SKIFF-RACE-10
-DTSTAMP:20240731T125000Z
-DTSTART:20240731T125000Z
-DTEND:20240731T132500Z
-DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T130500Z-sailing-MENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T130500Z
-DTSTART:20240731T130500Z
-DTEND:20240731T132600Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 9
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T133600Z-sailing-MENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T133600Z
-DTSTART:20240731T133600Z
-DTEND:20240731T135700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 10
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T134500Z-sailing-MENS-SKIFF-RACE-11
-DTSTAMP:20240731T134500Z
-DTSTART:20240731T134500Z
-DTEND:20240731T142000Z
-DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T140700Z-sailing-MENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T140700Z
-DTSTART:20240731T140700Z
-DTEND:20240731T142800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 11
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T143700Z-sailing-MENS-SKIFF-RACE-12
-DTSTAMP:20240731T143700Z
-DTSTART:20240731T143700Z
-DTEND:20240731T151200Z
-DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
-  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
-  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
-  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
-  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
-  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
-  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
-SUMMARY:⛵ Men's Skiff - Race 12
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240731T144800Z-sailing-WOMENS-WINDSURFING-RACE-8
-DTSTAMP:20240731T144800Z
-DTSTART:20240731T144800Z
-DTEND:20240731T150900Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 8\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -688,10 +515,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T151900Z-sailing-WOMENS-WINDSURFING-RACE-9
-DTSTAMP:20240731T151900Z
-DTSTART:20240731T151900Z
-DTEND:20240731T154000Z
+UID:20240731T101300Z-sailing-WOMENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T101300Z
+DTSTART:20240731T101300Z
+DTEND:20240731T111300Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 9\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -705,10 +532,72 @@ SUMMARY:⛵ Women's Windsurfing - Race 9
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T155000Z-sailing-WOMENS-WINDSURFING-RACE-10
-DTSTAMP:20240731T155000Z
-DTSTART:20240731T155000Z
-DTEND:20240731T161100Z
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-7
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 7\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 7
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T114300Z-sailing-MENS-WINDSURFING-RACE-8
+DTSTAMP:20240731T114300Z
+DTSTART:20240731T114300Z
+DTEND:20240731T124300Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 8\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 8
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T121500Z-sailing-MENS-SKIFF-RACE-10
+DTSTAMP:20240731T121500Z
+DTSTART:20240731T121500Z
+DTEND:20240731T125000Z
+DESCRIPTION:Sailing - Men's Skiff - Race 10\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T130700Z-sailing-MENS-SKIFF-RACE-11
+DTSTAMP:20240731T130700Z
+DTSTART:20240731T130700Z
+DTEND:20240731T134200Z
+DESCRIPTION:Sailing - Men's Skiff - Race 11\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T131300Z-sailing-WOMENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T131300Z
+DTSTART:20240731T131300Z
+DTEND:20240731T133400Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 10\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -722,10 +611,26 @@ SUMMARY:⛵ Women's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T162100Z-sailing-WOMENS-WINDSURFING-RACE-11
-DTSTAMP:20240731T162100Z
-DTSTART:20240731T162100Z
-DTEND:20240731T164200Z
+UID:20240731T131500Z-sailing-WOMENS-SKIFF-RACE-10
+DTSTAMP:20240731T131500Z
+DTSTART:20240731T131500Z
+DTEND:20240731T135000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 10\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 10
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T134400Z-sailing-WOMENS-WINDSURFING-RACE-11
+DTSTAMP:20240731T134400Z
+DTSTART:20240731T134400Z
+DTEND:20240731T140500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 11\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -739,20 +644,82 @@ SUMMARY:⛵ Women's Windsurfing - Race 11
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T165200Z-sailing-WOMENS-WINDSURFING-RACE-12
-DTSTAMP:20240731T165200Z
-DTSTART:20240731T165200Z
-DTEND:20240731T171300Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 12
+UID:20240731T135500Z-sailing-WOMENS-SKIFF-RACE-11
+DTSTAMP:20240731T135500Z
+DTSTART:20240731T135500Z
+DTEND:20240731T143000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 11\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T135900Z-sailing-MENS-SKIFF-RACE-12
+DTSTAMP:20240731T135900Z
+DTSTART:20240731T135900Z
+DTEND:20240731T143400Z
+DESCRIPTION:Sailing - Men's Skiff - Race 12\n🇨🇦 BARNES/JONES\n🇺🇸
+  BARROWS/HENKEN\n🇦🇹 BILDSTEIN/HUSSL\n🇪🇸 BOTIN/TRITTEL\n🇵🇱
+  BUKSAK/WIERZBICKI\n🇦🇺 COLLEY/CONNOR\n🇫🇷 FISCHER/PEQUIN\n🇳🇱
+  LAMBRIEX/WERKEN\n🇧🇪 LEFEBVRE/HEUNINCK\n🇩🇪 MEGGENDORF/SPRANGER\n🇳🇿
+  McHARDIE/McKENZIE\n🇩🇰 NYBORG/BUHL\n🇬🇧 PETERS/STERRITT\n🇭🇷 S
+  FANTELA/M FANTELA\n🇭🇰 SAKAI/ALYSWORTH\n🇨🇭 SCHNEITER/de PLANTA\n🇧🇷
+  SOFFIATTI/SIMOES\n🇺🇾 UMPIERRE/DIZ\n🇮🇪 WADDILOVE/DICKSON\n🇨🇳 WEN/LIU
+SUMMARY:⛵ Men's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T141500Z-sailing-MENS-WINDSURFING-RACE-9
+DTSTAMP:20240731T141500Z
+DTSTART:20240731T141500Z
+DTEND:20240731T143600Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 9\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 9
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T143500Z-sailing-WOMENS-SKIFF-RACE-12
+DTSTAMP:20240731T143500Z
+DTSTART:20240731T143500Z
+DTEND:20240731T151000Z
+DESCRIPTION:Sailing - Women's Skiff - Race 12\n🇳🇱 AANHOLT/DUETZ\n🇳🇿
+  ALEH/MEECH\n🇩🇪 BERGMANN/WILLE\n🇬🇧 BLACK/TIDEY\n🇸🇪
+  BOBECK/NETZLER\n🇨🇿 BURSKA/TKADLECOVA\n🇪🇸 ECHEGOYEN/BARCELO\n🇨🇦 G
+  LEWIN-L./A LEWIN-L.\n🇮🇹 GERMANI/BERTUZZI\n🇫🇮 GRONBLOM/HOKKA\n🇨🇳
+  HU/SHAN\n🇩🇰 J SCHMIDT/A SCHMIDT\n🇧🇪 MAENHAUT/GEURTS\n🇵🇱
+  MELZACKA/JANKOWIAK\n🇳🇴 NAESS/ROENNINGEN\n🇦🇺 PRICE/HASELDINE\n🇺🇸
+  ROBLE/SHEA\n🇧🇷 SOFFIATTI/KUNZE\n🇫🇷 STEYAERT/PICON\n🇯🇵
+  TANAKA/NAGAMATSU
+SUMMARY:⛵ Women's Skiff - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240731T144600Z-sailing-MENS-WINDSURFING-RACE-10
+DTSTAMP:20240731T144600Z
+DTSTART:20240731T144600Z
+DTEND:20240731T150700Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 10\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -783,10 +750,27 @@ SUMMARY:⛵ Men's Skiff Medal Race
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-13
+UID:20240801T130300Z-sailing-WOMENS-WINDSURFING-RACE-12
 DTSTAMP:20240801T130300Z
 DTSTART:20240801T130300Z
 DTEND:20240801T132400Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 12\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 12
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T133400Z
+DTSTART:20240801T133400Z
+DTEND:20240801T135500Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 13\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -800,23 +784,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T133400Z-sailing-WOMENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T133400Z
-DTSTART:20240801T133400Z
-DTEND:20240801T135500Z
-DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
-  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
-  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
-  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
-  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
-  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
-  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
-  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
-  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
-SUMMARY:⛵ Women's Windsurfing - Race 14
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T133500Z-sailing-WOMENS-DINGHY-RACE-1
 DTSTAMP:20240801T133500Z
 DTSTART:20240801T133500Z
@@ -835,10 +802,43 @@ SUMMARY:⛵ Women's Skiff Medal Race
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-12
+UID:20240801T135300Z-sailing-MENS-WINDSURFING-RACE-11
 DTSTAMP:20240801T135300Z
 DTSTART:20240801T135300Z
 DTEND:20240801T141400Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 11\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 11
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T140500Z
+DTSTART:20240801T140500Z
+DTEND:20240801T142600Z
+DESCRIPTION:Sailing - Women's Windsurfing - Race 14\n🇦🇷 Chiara
+  FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
+  NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
+  SVIKOVA\n🇸🇮 Lina ERZEN\n🇦🇹 Lorena ABICHT\n🇭🇰 MA Kwan Ching\n🇵🇱
+  Maja DZIARNOWSKA\n🇵🇪 Maria Belen BAZO GERMAN\n🇲🇽 Mariana AGUILAR
+  CHAVEZ PEON\n🇮🇹 Marta MAGGETTI\n🇹🇷 Merve VATAN\n🇳🇴 Mina
+  MOBEKK\n🇨🇾 Natasa LAPPA\n🇭🇷 Palma CARGO\n🇪🇸 Pilar LAMADRID
+  TRUEBA\n🇳🇱 Sara WENNEKES\n🇮🇱 Sharon KANTOR\n🇩🇪 Theresa Marie
+  STEINLEIN\n🇳🇿 Veerle TEN HAVE\n🇨🇳 YAN Zheng
+SUMMARY:⛵ Women's Windsurfing - Race 14
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-12
+DTSTAMP:20240801T142400Z
+DTSTART:20240801T142400Z
+DTEND:20240801T144500Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 12\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -851,10 +851,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 12
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T140500Z-sailing-WOMENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T140500Z
-DTSTART:20240801T140500Z
-DTEND:20240801T142600Z
+UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-15
+DTSTAMP:20240801T143600Z
+DTSTART:20240801T143600Z
+DTEND:20240801T145700Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 15\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -868,10 +868,19 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T142400Z-sailing-MENS-WINDSURFING-RACE-13
-DTSTAMP:20240801T142400Z
-DTSTART:20240801T142400Z
-DTEND:20240801T144500Z
+UID:20240801T144300Z-sailing-WOMENS-DINGHY-RACE-2
+DTSTAMP:20240801T144300Z
+DTSTART:20240801T144300Z
+DTEND:20240801T153400Z
+DESCRIPTION:Sailing - Women's Dinghy - Race 2
+SUMMARY:⛵ Women's Dinghy - Race 2
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
+UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-13
+DTSTAMP:20240801T145500Z
+DTSTART:20240801T145500Z
+DTEND:20240801T151600Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 13\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -884,10 +893,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 13
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T143600Z-sailing-WOMENS-WINDSURFING-RACE-16
-DTSTAMP:20240801T143600Z
-DTSTART:20240801T143600Z
-DTEND:20240801T145700Z
+UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T150700Z
+DTSTART:20240801T150700Z
+DTEND:20240801T152800Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 16\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -901,19 +910,10 @@ SUMMARY:⛵ Women's Windsurfing - Race 16
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T144300Z-sailing-WOMENS-DINGHY-RACE-2
-DTSTAMP:20240801T144300Z
-DTSTART:20240801T144300Z
-DTEND:20240801T153400Z
-DESCRIPTION:Sailing - Women's Dinghy - Race 2
-SUMMARY:⛵ Women's Dinghy - Race 2
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
-UID:20240801T145500Z-sailing-MENS-WINDSURFING-RACE-14
-DTSTAMP:20240801T145500Z
-DTSTART:20240801T145500Z
-DTEND:20240801T151600Z
+UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-14
+DTSTAMP:20240801T152600Z
+DTSTART:20240801T152600Z
+DTEND:20240801T154700Z
 DESCRIPTION:Sailing - Men's Windsurfing - Race 14\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
@@ -926,10 +926,10 @@ SUMMARY:⛵ Men's Windsurfing - Race 14
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T150700Z-sailing-WOMENS-WINDSURFING-RACE-17
-DTSTAMP:20240801T150700Z
-DTSTART:20240801T150700Z
-DTEND:20240801T152800Z
+UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-17
+DTSTAMP:20240801T153800Z
+DTSTART:20240801T153800Z
+DTEND:20240801T155900Z
 DESCRIPTION:Sailing - Women's Windsurfing - Race 17\n🇦🇷 Chiara
   FERRETTI\n🇺🇸 Dominique STATER\n🇬🇧 Emma WILSON\n🇫🇷 Helene
   NOESMOEN\n🇪🇪 Ingrid PUUSTA\n🇸🇪 Johanna HJERTBERG\n🇨🇿 Katerina
@@ -943,22 +943,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 17
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T152600Z-sailing-MENS-WINDSURFING-RACE-15
-DTSTAMP:20240801T152600Z
-DTSTART:20240801T152600Z
-DTEND:20240801T154700Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
-  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
-  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
-  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
-  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
-  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
-  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
-  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 15
-LOCATION:Marseille Marina
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T153800Z-sailing-WOMENS-WINDSURFING-RACE-18
 DTSTAMP:20240801T153800Z
 DTSTART:20240801T153800Z
@@ -976,11 +960,11 @@ SUMMARY:⛵ Women's Windsurfing - Race 18
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-16
+UID:20240801T155700Z-sailing-MENS-WINDSURFING-RACE-15
 DTSTAMP:20240801T155700Z
 DTSTART:20240801T155700Z
 DTEND:20240801T161800Z
-DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+DESCRIPTION:Sailing - Men's Windsurfing - Race 15\n🇭🇰 CHENG Ching
   Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
   BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
   Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
@@ -988,7 +972,7 @@ DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
   RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
   Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
   KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
-SUMMARY:⛵ Men's Windsurfing - Race 16
+SUMMARY:⛵ Men's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
@@ -1009,6 +993,22 @@ SUMMARY:⛵ Women's Windsurfing - Race 19
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-16
+DTSTAMP:20240801T162800Z
+DTSTART:20240801T162800Z
+DTEND:20240801T164900Z
+DESCRIPTION:Sailing - Men's Windsurfing - Race 16\n🇭🇰 CHENG Ching
+  Yin\n🇨🇭 Elia COLOMBO\n🇦🇼 Ethan WESTERA\n🇦🇷 Francisco CRUZ SAUBIDET
+  BIRKNER\n🇦🇺 Grae MORRIS\n🇨🇳 HUANG Jingye\n🇫🇮 Jakob EKLUND\n🇩🇰
+  Johan SOE\n🇳🇿 Josh ARMIT\n🇳🇱 Luuc van OPZEELAND\n🇧🇷 Mateus
+  ISAAC\n🇪🇸 Nacho BALTASAR SUMMERS\n🇫🇷 Nicolas GOYARD\n🇮🇹 Nicolo
+  RENNA\n🇺🇸 Noah LYONS\n🇵🇱 Pawel TARNOWSKI\n🇩🇿 Rami BOUDROUMA\n🇸🇰
+  Robert KUBIN\n🇱🇹 Rytis JASIUNAS\n🇬🇧 Sam SILLS\n🇩🇪 Sebastian
+  KOERDEL\n🇯🇵 TOMIZAWA Makoto\n🇮🇱 Tom REUVENY\n🇬🇷 Vyron KOKKALANIS
+SUMMARY:⛵ Men's Windsurfing - Race 16
+LOCATION:Marseille Marina
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T162800Z-sailing-MENS-WINDSURFING-RACE-17
 DTSTAMP:20240801T162800Z
 DTSTART:20240801T162800Z
diff --git a/docs/swimming/ALB.ics b/docs/swimming/ALB.ics
index e7a1268a6..9eeec67a5 100644
--- a/docs/swimming/ALB.ics
+++ b/docs/swimming/ALB.ics
@@ -8,18 +8,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/ANG.ics b/docs/swimming/ANG.ics
index 52034a8dc..46a262548 100644
--- a/docs/swimming/ANG.ics
+++ b/docs/swimming/ANG.ics
@@ -43,13 +43,9 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/ANT.ics b/docs/swimming/ANT.ics
index 1116594f5..146384062 100644
--- a/docs/swimming/ANT.ics
+++ b/docs/swimming/ANT.ics
@@ -8,18 +8,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,18 +21,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/ARG.ics b/docs/swimming/ARG.ics
index 0c08a70d0..11adb4d90 100644
--- a/docs/swimming/ARG.ics
+++ b/docs/swimming/ARG.ics
@@ -8,14 +8,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -24,18 +20,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -44,22 +34,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -68,12 +49,9 @@ UID:20240728T191000Z-swimming-WOMENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240728T191000Z
 DTSTART:20240728T191000Z
 DTEND:20240728T192200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇬🇧 Angharad
-  EVANS\n🇮🇹 Benedetta PILATO\n🇪🇪 Eneli JEFIMOVA\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇦🇷 Macarena
-  CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI
-  Satomi\n🇸🇪 Sophie HANSSON\n🇨🇳 TANG Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱
-  Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇦🇷 ARG\n🇨🇳
+  CHN\n🇪🇪 EST\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱
+  NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -82,14 +60,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/ARM.ics b/docs/swimming/ARM.ics
index ea4e9e809..f8f49b3e9 100644
--- a/docs/swimming/ARM.ics
+++ b/docs/swimming/ARM.ics
@@ -8,18 +8,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/ASA.ics b/docs/swimming/ASA.ics
index e1805a4a4..106e78024 100644
--- a/docs/swimming/ASA.ics
+++ b/docs/swimming/ASA.ics
@@ -8,18 +8,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/AUS.ics b/docs/swimming/AUS.ics
index da5fb1494..55499c817 100644
--- a/docs/swimming/AUS.ics
+++ b/docs/swimming/AUS.ics
@@ -8,18 +8,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,14 +21,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -44,18 +33,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -64,19 +46,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -85,27 +60,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -114,27 +72,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -143,12 +84,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -181,11 +119,8 @@ UID:20240727T191200Z-swimming-MENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240727T191200Z
 DTSTART:20240727T191200Z
 DTEND:20240727T202600Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇬🇧 Adam
-  PEATY\n🇳🇱 Arno KAMMINGA\n🇦🇹 Bernhard REITSHAMMER\n🇳🇱 Caspar
-  CORBEAU\n🇺🇸 Charlie SWANSON\n🇬🇧 James WILBY\n🇦🇺 Joshua YONG\n🇩🇪
-  Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇩🇪 Melvin IMOUDU\n🇺🇸
-  Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN Haiyang\n🇮🇱 Ron POLONSKY
+DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇳🇱 NED\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -214,16 +149,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -232,12 +161,9 @@ UID:20240728T091500Z-swimming-MENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240728T091500Z
 DTSTART:20240728T091500Z
 DTEND:20240728T092700Z
-DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇮🇹 Alberto
-  RAZZETTI\n🇬🇷 Apostolos PAPASTAMOS\n🇭🇺 Balazs HOLLO\n🇦🇺 Brendon
-  SMITH\n🇺🇸 Carson FOSTER\n🇩🇪 Cedric BUESSING\n🇺🇸 Chase KALISZ\n🇭🇺
-  Gabor ZOMBORI\n🇫🇷 Leon MARCHAND\n🇳🇿 Lewis CLAREBURT\n🇯🇵 MATSUSHITA
-  Tomoyuki\n🇬🇧 Max LITCHFIELD\n🇯🇵 SETO Daiya\n🇨🇦 Tristan
-  JANKOVICS\n🇦🇺 William Campbell PETRIC\n🇨🇳 ZHANG Zhanshuo
+DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇳🇿 NZL\n🇺🇸 USA
 SUMMARY:🏊 Men's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -246,18 +172,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -266,22 +186,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -290,18 +201,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -322,12 +226,9 @@ UID:20240728T184600Z-swimming-MENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T184600Z
 DTSTART:20240728T184600Z
 DTEND:20240728T190000Z
-DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇮🇹 Alessandro
-  RAGAINI\n🇱🇹 Danas RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧
-  Duncan SCOTT\n🇮🇹 Filippo MEGLI\n🇰🇷 HWANG Sunwoo\n🇰🇷 KIM
-  Woomin\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵
-  MATSUMOTO Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian
-  GIULIANI\n🇩🇪 Rafael MIROSLAW\n🇦🇺 Thomas NEILL
+DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹
+  LTU\n🇷🇴 ROU\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -336,13 +237,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -351,12 +248,9 @@ UID:20240729T090000Z-swimming-WOMENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240729T090000Z
 DTSTART:20240729T090000Z
 DTEND:20240729T091200Z
-DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇮🇱
-  Anastasia GORBENKO\n🇷🇸 Anja CREVAR\n🇨🇦 Ella JANSEN\n🇦🇺 Ella
-  RAMSAY\n🇮🇪 Ellen WALSHE\n🇪🇸 Emma CARRASCO CADENS\n🇺🇸 Emma
-  WEYANT\n🇬🇧 Freya Constance COLBERT\n🇦🇺 Jenna FORRESTER\n🇺🇸 Katie
-  GRIMES\n🇬🇧 Katie SHANAHAN\n🇯🇵 NARITA Mio\n🇮🇹 Sara FRANCESCHI\n🇨🇦
-  Summer McINTOSH\n🇯🇵 TANIGAWA Ageha\n🇭🇺 Vivien JACKL
+DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵
+  JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -365,18 +259,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -385,17 +272,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -428,12 +309,9 @@ UID:20240729T190100Z-swimming-WOMENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240729T190100Z
 DTSTART:20240729T190100Z
 DTEND:20240729T191500Z
-DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇫🇷 Beryl
-  GASTALDELLO\n🇪🇸 Carmen WEILER SASTRE\n🇮🇪 Danielle HILL\n🇫🇷 Emma
-  TEREBO\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪
-  Louise HANSSON\n🇳🇱 Maaike de WAARD\n🇺🇸 Regan SMITH\n🇧🇪 Roos
-  VANOTTERDIJK\n🇨🇳 WAN Letian\n🇨🇳 WANG Xueer
+DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇮🇪 IRL\n🇳🇱 NED\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -662,14 +540,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -678,16 +552,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -696,13 +564,9 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/AUT.ics b/docs/swimming/AUT.ics
index 9e0b4683d..776c4ecbc 100644
--- a/docs/swimming/AUT.ics
+++ b/docs/swimming/AUT.ics
@@ -8,18 +8,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,19 +21,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -49,11 +35,8 @@ UID:20240727T191200Z-swimming-MENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240727T191200Z
 DTSTART:20240727T191200Z
 DTEND:20240727T202600Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇬🇧 Adam
-  PEATY\n🇳🇱 Arno KAMMINGA\n🇦🇹 Bernhard REITSHAMMER\n🇳🇱 Caspar
-  CORBEAU\n🇺🇸 Charlie SWANSON\n🇬🇧 James WILBY\n🇦🇺 Joshua YONG\n🇩🇪
-  Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇩🇪 Melvin IMOUDU\n🇺🇸
-  Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN Haiyang\n🇮🇱 Ron POLONSKY
+DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇳🇱 NED\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -62,16 +45,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -80,22 +57,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -104,17 +72,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/BEL.ics b/docs/swimming/BEL.ics
index 6d919bbc6..c0ac99f80 100644
--- a/docs/swimming/BEL.ics
+++ b/docs/swimming/BEL.ics
@@ -8,18 +8,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,14 +21,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -44,19 +33,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -65,12 +47,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -79,16 +58,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -97,18 +70,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -117,12 +83,9 @@ UID:20240728T184600Z-swimming-MENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T184600Z
 DTSTART:20240728T184600Z
 DTEND:20240728T190000Z
-DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇮🇹 Alessandro
-  RAGAINI\n🇱🇹 Danas RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧
-  Duncan SCOTT\n🇮🇹 Filippo MEGLI\n🇰🇷 HWANG Sunwoo\n🇰🇷 KIM
-  Woomin\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵
-  MATSUMOTO Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian
-  GIULIANI\n🇩🇪 Rafael MIROSLAW\n🇦🇺 Thomas NEILL
+DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹
+  LTU\n🇷🇴 ROU\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -131,13 +94,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -146,18 +105,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -166,17 +118,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -185,12 +131,9 @@ UID:20240729T190100Z-swimming-WOMENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240729T190100Z
 DTSTART:20240729T190100Z
 DTEND:20240729T191500Z
-DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇫🇷 Beryl
-  GASTALDELLO\n🇪🇸 Carmen WEILER SASTRE\n🇮🇪 Danielle HILL\n🇫🇷 Emma
-  TEREBO\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪
-  Louise HANSSON\n🇳🇱 Maaike de WAARD\n🇺🇸 Regan SMITH\n🇧🇪 Roos
-  VANOTTERDIJK\n🇨🇳 WAN Letian\n🇨🇳 WANG Xueer
+DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇮🇪 IRL\n🇳🇱 NED\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/BEN.ics b/docs/swimming/BEN.ics
index bb83b2dcb..e054c7ac0 100644
--- a/docs/swimming/BEN.ics
+++ b/docs/swimming/BEN.ics
@@ -8,22 +8,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/BER.ics b/docs/swimming/BER.ics
index 4910f3069..c30409568 100644
--- a/docs/swimming/BER.ics
+++ b/docs/swimming/BER.ics
@@ -8,22 +8,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -32,18 +23,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/BIH.ics b/docs/swimming/BIH.ics
index 8c3b27d01..38b7ab107 100644
--- a/docs/swimming/BIH.ics
+++ b/docs/swimming/BIH.ics
@@ -8,18 +8,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,19 +21,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -49,13 +35,9 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/BOT.ics b/docs/swimming/BOT.ics
index 07d5a557f..b383cdc33 100644
--- a/docs/swimming/BOT.ics
+++ b/docs/swimming/BOT.ics
@@ -8,18 +8,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/BRA.ics b/docs/swimming/BRA.ics
index a6ffab900..842bee5cd 100644
--- a/docs/swimming/BRA.ics
+++ b/docs/swimming/BRA.ics
@@ -8,14 +8,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -24,19 +20,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -45,27 +34,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -74,27 +46,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -127,16 +82,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -145,18 +94,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -165,13 +107,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -180,17 +118,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/BRN.ics b/docs/swimming/BRN.ics
index f49c88f57..25ed98494 100644
--- a/docs/swimming/BRN.ics
+++ b/docs/swimming/BRN.ics
@@ -8,18 +8,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/BRU.ics b/docs/swimming/BRU.ics
index 28e59007d..f9d7e45ce 100644
--- a/docs/swimming/BRU.ics
+++ b/docs/swimming/BRU.ics
@@ -8,22 +8,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/BUL.ics b/docs/swimming/BUL.ics
index 54a89445f..8cc17530f 100644
--- a/docs/swimming/BUL.ics
+++ b/docs/swimming/BUL.ics
@@ -8,19 +8,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -29,18 +22,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/CAN.ics b/docs/swimming/CAN.ics
index 6f737a849..d3a705ecf 100644
--- a/docs/swimming/CAN.ics
+++ b/docs/swimming/CAN.ics
@@ -8,18 +8,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,14 +21,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -44,27 +33,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -73,27 +45,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -102,12 +57,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -148,12 +100,9 @@ UID:20240728T091500Z-swimming-MENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240728T091500Z
 DTSTART:20240728T091500Z
 DTEND:20240728T092700Z
-DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇮🇹 Alberto
-  RAZZETTI\n🇬🇷 Apostolos PAPASTAMOS\n🇭🇺 Balazs HOLLO\n🇦🇺 Brendon
-  SMITH\n🇺🇸 Carson FOSTER\n🇩🇪 Cedric BUESSING\n🇺🇸 Chase KALISZ\n🇭🇺
-  Gabor ZOMBORI\n🇫🇷 Leon MARCHAND\n🇳🇿 Lewis CLAREBURT\n🇯🇵 MATSUSHITA
-  Tomoyuki\n🇬🇧 Max LITCHFIELD\n🇯🇵 SETO Daiya\n🇨🇦 Tristan
-  JANKOVICS\n🇦🇺 William Campbell PETRIC\n🇨🇳 ZHANG Zhanshuo
+DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇳🇿 NZL\n🇺🇸 USA
 SUMMARY:🏊 Men's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -162,18 +111,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -182,22 +125,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -206,18 +140,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -238,12 +165,9 @@ UID:20240728T193200Z-swimming-MENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240728T193200Z
 DTSTART:20240728T193200Z
 DTEND:20240728T194400Z
-DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇬🇷 Apostolos
-  CHRISTOU\n🇨🇦 Blake TIERNEY\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert
-  KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇬🇧 Jonny
-  MARSHALL\n🇵🇱 Ksawery MASIUK\n🇫🇷 Mewen TOMAC\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇺🇸 Ryan MURPHY\n🇮🇹
-  Thomas CECCON\n🇨🇳 XU Jiayu\n🇫🇷 Yohann NDOYE-BROUARD
+DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹 ITA\n🇵🇱
+  POL\n🇿🇦 RSA\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -252,13 +176,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -267,12 +187,9 @@ UID:20240729T090000Z-swimming-WOMENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240729T090000Z
 DTSTART:20240729T090000Z
 DTEND:20240729T091200Z
-DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇮🇱
-  Anastasia GORBENKO\n🇷🇸 Anja CREVAR\n🇨🇦 Ella JANSEN\n🇦🇺 Ella
-  RAMSAY\n🇮🇪 Ellen WALSHE\n🇪🇸 Emma CARRASCO CADENS\n🇺🇸 Emma
-  WEYANT\n🇬🇧 Freya Constance COLBERT\n🇦🇺 Jenna FORRESTER\n🇺🇸 Katie
-  GRIMES\n🇬🇧 Katie SHANAHAN\n🇯🇵 NARITA Mio\n🇮🇹 Sara FRANCESCHI\n🇨🇦
-  Summer McINTOSH\n🇯🇵 TANIGAWA Ageha\n🇭🇺 Vivien JACKL
+DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵
+  JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -281,18 +198,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -313,12 +223,9 @@ UID:20240729T190100Z-swimming-WOMENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240729T190100Z
 DTSTART:20240729T190100Z
 DTEND:20240729T191500Z
-DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇫🇷 Beryl
-  GASTALDELLO\n🇪🇸 Carmen WEILER SASTRE\n🇮🇪 Danielle HILL\n🇫🇷 Emma
-  TEREBO\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪
-  Louise HANSSON\n🇳🇱 Maaike de WAARD\n🇺🇸 Regan SMITH\n🇧🇪 Roos
-  VANOTTERDIJK\n🇨🇳 WAN Letian\n🇨🇳 WANG Xueer
+DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇮🇪 IRL\n🇳🇱 NED\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -480,14 +387,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -496,16 +399,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -514,13 +411,9 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/CHI.ics b/docs/swimming/CHI.ics
index d1959cf8a..3ca29a562 100644
--- a/docs/swimming/CHI.ics
+++ b/docs/swimming/CHI.ics
@@ -8,19 +8,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/CHN.ics b/docs/swimming/CHN.ics
index b093473f2..941453ebd 100644
--- a/docs/swimming/CHN.ics
+++ b/docs/swimming/CHN.ics
@@ -8,18 +8,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,14 +21,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -44,18 +33,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -64,19 +46,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -85,27 +60,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -114,27 +72,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -143,12 +84,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -169,11 +107,8 @@ UID:20240727T191200Z-swimming-MENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240727T191200Z
 DTSTART:20240727T191200Z
 DTEND:20240727T202600Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇬🇧 Adam
-  PEATY\n🇳🇱 Arno KAMMINGA\n🇦🇹 Bernhard REITSHAMMER\n🇳🇱 Caspar
-  CORBEAU\n🇺🇸 Charlie SWANSON\n🇬🇧 James WILBY\n🇦🇺 Joshua YONG\n🇩🇪
-  Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇩🇪 Melvin IMOUDU\n🇺🇸
-  Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN Haiyang\n🇮🇱 Ron POLONSKY
+DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇳🇱 NED\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -202,16 +137,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -220,12 +149,9 @@ UID:20240728T091500Z-swimming-MENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240728T091500Z
 DTSTART:20240728T091500Z
 DTEND:20240728T092700Z
-DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇮🇹 Alberto
-  RAZZETTI\n🇬🇷 Apostolos PAPASTAMOS\n🇭🇺 Balazs HOLLO\n🇦🇺 Brendon
-  SMITH\n🇺🇸 Carson FOSTER\n🇩🇪 Cedric BUESSING\n🇺🇸 Chase KALISZ\n🇭🇺
-  Gabor ZOMBORI\n🇫🇷 Leon MARCHAND\n🇳🇿 Lewis CLAREBURT\n🇯🇵 MATSUSHITA
-  Tomoyuki\n🇬🇧 Max LITCHFIELD\n🇯🇵 SETO Daiya\n🇨🇦 Tristan
-  JANKOVICS\n🇦🇺 William Campbell PETRIC\n🇨🇳 ZHANG Zhanshuo
+DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇳🇿 NZL\n🇺🇸 USA
 SUMMARY:🏊 Men's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -234,18 +160,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -254,22 +174,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -278,18 +189,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -310,12 +214,9 @@ UID:20240728T191000Z-swimming-WOMENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240728T191000Z
 DTSTART:20240728T191000Z
 DTEND:20240728T192200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇬🇧 Angharad
-  EVANS\n🇮🇹 Benedetta PILATO\n🇪🇪 Eneli JEFIMOVA\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇦🇷 Macarena
-  CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI
-  Satomi\n🇸🇪 Sophie HANSSON\n🇨🇳 TANG Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱
-  Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇦🇷 ARG\n🇨🇳
+  CHN\n🇪🇪 EST\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱
+  NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -324,12 +225,9 @@ UID:20240728T193200Z-swimming-MENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240728T193200Z
 DTSTART:20240728T193200Z
 DTEND:20240728T194400Z
-DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇬🇷 Apostolos
-  CHRISTOU\n🇨🇦 Blake TIERNEY\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert
-  KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇬🇧 Jonny
-  MARSHALL\n🇵🇱 Ksawery MASIUK\n🇫🇷 Mewen TOMAC\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇺🇸 Ryan MURPHY\n🇮🇹
-  Thomas CECCON\n🇨🇳 XU Jiayu\n🇫🇷 Yohann NDOYE-BROUARD
+DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹 ITA\n🇵🇱
+  POL\n🇿🇦 RSA\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -349,13 +247,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -364,18 +258,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -384,17 +271,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -403,12 +284,9 @@ UID:20240729T190100Z-swimming-WOMENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240729T190100Z
 DTSTART:20240729T190100Z
 DTEND:20240729T191500Z
-DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇫🇷 Beryl
-  GASTALDELLO\n🇪🇸 Carmen WEILER SASTRE\n🇮🇪 Danielle HILL\n🇫🇷 Emma
-  TEREBO\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪
-  Louise HANSSON\n🇳🇱 Maaike de WAARD\n🇺🇸 Regan SMITH\n🇧🇪 Roos
-  VANOTTERDIJK\n🇨🇳 WAN Letian\n🇨🇳 WANG Xueer
+DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇮🇪 IRL\n🇳🇱 NED\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -636,14 +514,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -652,16 +526,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -670,13 +538,9 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/COK.ics b/docs/swimming/COK.ics
index 5f8250ccd..aa7bfc5b0 100644
--- a/docs/swimming/COK.ics
+++ b/docs/swimming/COK.ics
@@ -8,18 +8,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/COL.ics b/docs/swimming/COL.ics
index eaf02f075..3f46717b3 100644
--- a/docs/swimming/COL.ics
+++ b/docs/swimming/COL.ics
@@ -8,18 +8,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,22 +22,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/CRC.ics b/docs/swimming/CRC.ics
index 6fc2c9587..4dd80712f 100644
--- a/docs/swimming/CRC.ics
+++ b/docs/swimming/CRC.ics
@@ -8,19 +8,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -29,13 +22,9 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/CUB.ics b/docs/swimming/CUB.ics
index a2b7417d7..0420bc091 100644
--- a/docs/swimming/CUB.ics
+++ b/docs/swimming/CUB.ics
@@ -8,18 +8,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/CZE.ics b/docs/swimming/CZE.ics
index bedce88f7..4c7fd3abc 100644
--- a/docs/swimming/CZE.ics
+++ b/docs/swimming/CZE.ics
@@ -8,18 +8,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,12 +21,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -42,18 +32,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -62,22 +46,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -86,18 +61,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -106,12 +74,9 @@ UID:20240728T193200Z-swimming-MENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240728T193200Z
 DTSTART:20240728T193200Z
 DTEND:20240728T194400Z
-DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇬🇷 Apostolos
-  CHRISTOU\n🇨🇦 Blake TIERNEY\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert
-  KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇬🇧 Jonny
-  MARSHALL\n🇵🇱 Ksawery MASIUK\n🇫🇷 Mewen TOMAC\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇺🇸 Ryan MURPHY\n🇮🇹
-  Thomas CECCON\n🇨🇳 XU Jiayu\n🇫🇷 Yohann NDOYE-BROUARD
+DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹 ITA\n🇵🇱
+  POL\n🇿🇦 RSA\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -120,13 +85,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -215,14 +176,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/DEN.ics b/docs/swimming/DEN.ics
index afb17c34a..9e3ddbfd0 100644
--- a/docs/swimming/DEN.ics
+++ b/docs/swimming/DEN.ics
@@ -8,18 +8,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,27 +21,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -57,14 +33,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -73,13 +45,9 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/DOM.ics b/docs/swimming/DOM.ics
index 1c4cde988..0d73668cc 100644
--- a/docs/swimming/DOM.ics
+++ b/docs/swimming/DOM.ics
@@ -8,18 +8,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/EGY.ics b/docs/swimming/EGY.ics
index ce1459be5..77a20f131 100644
--- a/docs/swimming/EGY.ics
+++ b/docs/swimming/EGY.ics
@@ -8,18 +8,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,17 +21,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/ESA.ics b/docs/swimming/ESA.ics
index bcd61a42d..9c58d99e8 100644
--- a/docs/swimming/ESA.ics
+++ b/docs/swimming/ESA.ics
@@ -8,18 +8,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/ESP.ics b/docs/swimming/ESP.ics
index ba490b17c..ca8626115 100644
--- a/docs/swimming/ESP.ics
+++ b/docs/swimming/ESP.ics
@@ -8,18 +8,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,27 +21,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -57,18 +33,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -77,22 +47,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -101,12 +62,9 @@ UID:20240728T193200Z-swimming-MENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240728T193200Z
 DTSTART:20240728T193200Z
 DTEND:20240728T194400Z
-DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇬🇷 Apostolos
-  CHRISTOU\n🇨🇦 Blake TIERNEY\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert
-  KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇬🇧 Jonny
-  MARSHALL\n🇵🇱 Ksawery MASIUK\n🇫🇷 Mewen TOMAC\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇺🇸 Ryan MURPHY\n🇮🇹
-  Thomas CECCON\n🇨🇳 XU Jiayu\n🇫🇷 Yohann NDOYE-BROUARD
+DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹 ITA\n🇵🇱
+  POL\n🇿🇦 RSA\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -115,12 +73,9 @@ UID:20240729T090000Z-swimming-WOMENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240729T090000Z
 DTSTART:20240729T090000Z
 DTEND:20240729T091200Z
-DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇮🇱
-  Anastasia GORBENKO\n🇷🇸 Anja CREVAR\n🇨🇦 Ella JANSEN\n🇦🇺 Ella
-  RAMSAY\n🇮🇪 Ellen WALSHE\n🇪🇸 Emma CARRASCO CADENS\n🇺🇸 Emma
-  WEYANT\n🇬🇧 Freya Constance COLBERT\n🇦🇺 Jenna FORRESTER\n🇺🇸 Katie
-  GRIMES\n🇬🇧 Katie SHANAHAN\n🇯🇵 NARITA Mio\n🇮🇹 Sara FRANCESCHI\n🇨🇦
-  Summer McINTOSH\n🇯🇵 TANIGAWA Ageha\n🇭🇺 Vivien JACKL
+DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵
+  JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -129,18 +84,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -149,17 +97,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -168,12 +110,9 @@ UID:20240729T190100Z-swimming-WOMENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240729T190100Z
 DTSTART:20240729T190100Z
 DTEND:20240729T191500Z
-DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇫🇷 Beryl
-  GASTALDELLO\n🇪🇸 Carmen WEILER SASTRE\n🇮🇪 Danielle HILL\n🇫🇷 Emma
-  TEREBO\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪
-  Louise HANSSON\n🇳🇱 Maaike de WAARD\n🇺🇸 Regan SMITH\n🇧🇪 Roos
-  VANOTTERDIJK\n🇨🇳 WAN Letian\n🇨🇳 WANG Xueer
+DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇮🇪 IRL\n🇳🇱 NED\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -290,14 +229,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -306,16 +241,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -324,13 +253,9 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/EST.ics b/docs/swimming/EST.ics
index 0f21b61e5..eded5d22a 100644
--- a/docs/swimming/EST.ics
+++ b/docs/swimming/EST.ics
@@ -8,19 +8,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -29,18 +22,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -49,12 +36,9 @@ UID:20240728T191000Z-swimming-WOMENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240728T191000Z
 DTSTART:20240728T191000Z
 DTEND:20240728T192200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇬🇧 Angharad
-  EVANS\n🇮🇹 Benedetta PILATO\n🇪🇪 Eneli JEFIMOVA\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇦🇷 Macarena
-  CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI
-  Satomi\n🇸🇪 Sophie HANSSON\n🇨🇳 TANG Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱
-  Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇦🇷 ARG\n🇨🇳
+  CHN\n🇪🇪 EST\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱
+  NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -106,14 +90,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/FIN.ics b/docs/swimming/FIN.ics
index 1d08aaf53..ba92f457e 100644
--- a/docs/swimming/FIN.ics
+++ b/docs/swimming/FIN.ics
@@ -8,18 +8,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/FRA.ics b/docs/swimming/FRA.ics
index d51b2f59d..5ef641b77 100644
--- a/docs/swimming/FRA.ics
+++ b/docs/swimming/FRA.ics
@@ -8,18 +8,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,14 +21,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -44,19 +33,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -65,27 +47,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -94,27 +59,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -123,12 +71,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -147,12 +92,9 @@ UID:20240728T091500Z-swimming-MENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240728T091500Z
 DTSTART:20240728T091500Z
 DTEND:20240728T092700Z
-DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇮🇹 Alberto
-  RAZZETTI\n🇬🇷 Apostolos PAPASTAMOS\n🇭🇺 Balazs HOLLO\n🇦🇺 Brendon
-  SMITH\n🇺🇸 Carson FOSTER\n🇩🇪 Cedric BUESSING\n🇺🇸 Chase KALISZ\n🇭🇺
-  Gabor ZOMBORI\n🇫🇷 Leon MARCHAND\n🇳🇿 Lewis CLAREBURT\n🇯🇵 MATSUSHITA
-  Tomoyuki\n🇬🇧 Max LITCHFIELD\n🇯🇵 SETO Daiya\n🇨🇦 Tristan
-  JANKOVICS\n🇦🇺 William Campbell PETRIC\n🇨🇳 ZHANG Zhanshuo
+DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇳🇿 NZL\n🇺🇸 USA
 SUMMARY:🏊 Men's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -161,22 +103,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -197,12 +130,9 @@ UID:20240728T193200Z-swimming-MENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240728T193200Z
 DTSTART:20240728T193200Z
 DTEND:20240728T194400Z
-DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇬🇷 Apostolos
-  CHRISTOU\n🇨🇦 Blake TIERNEY\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert
-  KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇬🇧 Jonny
-  MARSHALL\n🇵🇱 Ksawery MASIUK\n🇫🇷 Mewen TOMAC\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇺🇸 Ryan MURPHY\n🇮🇹
-  Thomas CECCON\n🇨🇳 XU Jiayu\n🇫🇷 Yohann NDOYE-BROUARD
+DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹 ITA\n🇵🇱
+  POL\n🇿🇦 RSA\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -211,18 +141,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -231,17 +154,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -250,12 +167,9 @@ UID:20240729T190100Z-swimming-WOMENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240729T190100Z
 DTSTART:20240729T190100Z
 DTEND:20240729T191500Z
-DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇫🇷 Beryl
-  GASTALDELLO\n🇪🇸 Carmen WEILER SASTRE\n🇮🇪 Danielle HILL\n🇫🇷 Emma
-  TEREBO\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪
-  Louise HANSSON\n🇳🇱 Maaike de WAARD\n🇺🇸 Regan SMITH\n🇧🇪 Roos
-  VANOTTERDIJK\n🇨🇳 WAN Letian\n🇨🇳 WANG Xueer
+DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇮🇪 IRL\n🇳🇱 NED\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -498,16 +412,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/FSM.ics b/docs/swimming/FSM.ics
index b346f62c7..46a4ab0cf 100644
--- a/docs/swimming/FSM.ics
+++ b/docs/swimming/FSM.ics
@@ -8,18 +8,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/GAM.ics b/docs/swimming/GAM.ics
index f34eab3e6..6c30eb704 100644
--- a/docs/swimming/GAM.ics
+++ b/docs/swimming/GAM.ics
@@ -8,18 +8,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/GBR.ics b/docs/swimming/GBR.ics
index c98fb21d1..28b5c41bc 100644
--- a/docs/swimming/GBR.ics
+++ b/docs/swimming/GBR.ics
@@ -8,18 +8,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,18 +21,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -48,19 +34,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -69,27 +48,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -98,27 +60,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -127,12 +72,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -141,11 +83,8 @@ UID:20240727T191200Z-swimming-MENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240727T191200Z
 DTSTART:20240727T191200Z
 DTEND:20240727T202600Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇬🇧 Adam
-  PEATY\n🇳🇱 Arno KAMMINGA\n🇦🇹 Bernhard REITSHAMMER\n🇳🇱 Caspar
-  CORBEAU\n🇺🇸 Charlie SWANSON\n🇬🇧 James WILBY\n🇦🇺 Joshua YONG\n🇩🇪
-  Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇩🇪 Melvin IMOUDU\n🇺🇸
-  Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN Haiyang\n🇮🇱 Ron POLONSKY
+DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇳🇱 NED\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -174,16 +113,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -192,12 +125,9 @@ UID:20240728T091500Z-swimming-MENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240728T091500Z
 DTSTART:20240728T091500Z
 DTEND:20240728T092700Z
-DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇮🇹 Alberto
-  RAZZETTI\n🇬🇷 Apostolos PAPASTAMOS\n🇭🇺 Balazs HOLLO\n🇦🇺 Brendon
-  SMITH\n🇺🇸 Carson FOSTER\n🇩🇪 Cedric BUESSING\n🇺🇸 Chase KALISZ\n🇭🇺
-  Gabor ZOMBORI\n🇫🇷 Leon MARCHAND\n🇳🇿 Lewis CLAREBURT\n🇯🇵 MATSUSHITA
-  Tomoyuki\n🇬🇧 Max LITCHFIELD\n🇯🇵 SETO Daiya\n🇨🇦 Tristan
-  JANKOVICS\n🇦🇺 William Campbell PETRIC\n🇨🇳 ZHANG Zhanshuo
+DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇳🇿 NZL\n🇺🇸 USA
 SUMMARY:🏊 Men's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -206,18 +136,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -226,22 +150,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -262,12 +177,9 @@ UID:20240728T184600Z-swimming-MENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T184600Z
 DTSTART:20240728T184600Z
 DTEND:20240728T190000Z
-DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇮🇹 Alessandro
-  RAGAINI\n🇱🇹 Danas RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧
-  Duncan SCOTT\n🇮🇹 Filippo MEGLI\n🇰🇷 HWANG Sunwoo\n🇰🇷 KIM
-  Woomin\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵
-  MATSUMOTO Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian
-  GIULIANI\n🇩🇪 Rafael MIROSLAW\n🇦🇺 Thomas NEILL
+DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹
+  LTU\n🇷🇴 ROU\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -276,12 +188,9 @@ UID:20240728T191000Z-swimming-WOMENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240728T191000Z
 DTSTART:20240728T191000Z
 DTEND:20240728T192200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇬🇧 Angharad
-  EVANS\n🇮🇹 Benedetta PILATO\n🇪🇪 Eneli JEFIMOVA\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇦🇷 Macarena
-  CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI
-  Satomi\n🇸🇪 Sophie HANSSON\n🇨🇳 TANG Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱
-  Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇦🇷 ARG\n🇨🇳
+  CHN\n🇪🇪 EST\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱
+  NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -290,12 +199,9 @@ UID:20240728T193200Z-swimming-MENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240728T193200Z
 DTSTART:20240728T193200Z
 DTEND:20240728T194400Z
-DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇬🇷 Apostolos
-  CHRISTOU\n🇨🇦 Blake TIERNEY\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert
-  KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇬🇧 Jonny
-  MARSHALL\n🇵🇱 Ksawery MASIUK\n🇫🇷 Mewen TOMAC\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇺🇸 Ryan MURPHY\n🇮🇹
-  Thomas CECCON\n🇨🇳 XU Jiayu\n🇫🇷 Yohann NDOYE-BROUARD
+DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹 ITA\n🇵🇱
+  POL\n🇿🇦 RSA\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -315,12 +221,9 @@ UID:20240729T090000Z-swimming-WOMENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240729T090000Z
 DTSTART:20240729T090000Z
 DTEND:20240729T091200Z
-DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇮🇱
-  Anastasia GORBENKO\n🇷🇸 Anja CREVAR\n🇨🇦 Ella JANSEN\n🇦🇺 Ella
-  RAMSAY\n🇮🇪 Ellen WALSHE\n🇪🇸 Emma CARRASCO CADENS\n🇺🇸 Emma
-  WEYANT\n🇬🇧 Freya Constance COLBERT\n🇦🇺 Jenna FORRESTER\n🇺🇸 Katie
-  GRIMES\n🇬🇧 Katie SHANAHAN\n🇯🇵 NARITA Mio\n🇮🇹 Sara FRANCESCHI\n🇨🇦
-  Summer McINTOSH\n🇯🇵 TANIGAWA Ageha\n🇭🇺 Vivien JACKL
+DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵
+  JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -329,18 +232,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -517,16 +413,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -535,13 +425,9 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/GEO.ics b/docs/swimming/GEO.ics
index fe0ff6be5..401aed23b 100644
--- a/docs/swimming/GEO.ics
+++ b/docs/swimming/GEO.ics
@@ -8,18 +8,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,22 +21,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/GER.ics b/docs/swimming/GER.ics
index bda5f70c5..bee617fc5 100644
--- a/docs/swimming/GER.ics
+++ b/docs/swimming/GER.ics
@@ -8,18 +8,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,14 +21,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -44,18 +33,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -64,19 +46,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -85,27 +60,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -114,12 +72,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -152,11 +107,8 @@ UID:20240727T191200Z-swimming-MENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240727T191200Z
 DTSTART:20240727T191200Z
 DTEND:20240727T202600Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇬🇧 Adam
-  PEATY\n🇳🇱 Arno KAMMINGA\n🇦🇹 Bernhard REITSHAMMER\n🇳🇱 Caspar
-  CORBEAU\n🇺🇸 Charlie SWANSON\n🇬🇧 James WILBY\n🇦🇺 Joshua YONG\n🇩🇪
-  Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇩🇪 Melvin IMOUDU\n🇺🇸
-  Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN Haiyang\n🇮🇱 Ron POLONSKY
+DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇳🇱 NED\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -184,16 +136,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -202,12 +148,9 @@ UID:20240728T091500Z-swimming-MENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240728T091500Z
 DTSTART:20240728T091500Z
 DTEND:20240728T092700Z
-DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇮🇹 Alberto
-  RAZZETTI\n🇬🇷 Apostolos PAPASTAMOS\n🇭🇺 Balazs HOLLO\n🇦🇺 Brendon
-  SMITH\n🇺🇸 Carson FOSTER\n🇩🇪 Cedric BUESSING\n🇺🇸 Chase KALISZ\n🇭🇺
-  Gabor ZOMBORI\n🇫🇷 Leon MARCHAND\n🇳🇿 Lewis CLAREBURT\n🇯🇵 MATSUSHITA
-  Tomoyuki\n🇬🇧 Max LITCHFIELD\n🇯🇵 SETO Daiya\n🇨🇦 Tristan
-  JANKOVICS\n🇦🇺 William Campbell PETRIC\n🇨🇳 ZHANG Zhanshuo
+DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇳🇿 NZL\n🇺🇸 USA
 SUMMARY:🏊 Men's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -216,18 +159,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -236,22 +173,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -260,18 +188,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -304,12 +225,9 @@ UID:20240728T184600Z-swimming-MENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T184600Z
 DTSTART:20240728T184600Z
 DTEND:20240728T190000Z
-DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇮🇹 Alessandro
-  RAGAINI\n🇱🇹 Danas RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧
-  Duncan SCOTT\n🇮🇹 Filippo MEGLI\n🇰🇷 HWANG Sunwoo\n🇰🇷 KIM
-  Woomin\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵
-  MATSUMOTO Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian
-  GIULIANI\n🇩🇪 Rafael MIROSLAW\n🇦🇺 Thomas NEILL
+DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹
+  LTU\n🇷🇴 ROU\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -329,17 +247,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -474,16 +386,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/GRE.ics b/docs/swimming/GRE.ics
index ac0b6139f..4f689c622 100644
--- a/docs/swimming/GRE.ics
+++ b/docs/swimming/GRE.ics
@@ -8,18 +8,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,27 +21,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -57,12 +33,9 @@ UID:20240728T091500Z-swimming-MENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240728T091500Z
 DTSTART:20240728T091500Z
 DTEND:20240728T092700Z
-DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇮🇹 Alberto
-  RAZZETTI\n🇬🇷 Apostolos PAPASTAMOS\n🇭🇺 Balazs HOLLO\n🇦🇺 Brendon
-  SMITH\n🇺🇸 Carson FOSTER\n🇩🇪 Cedric BUESSING\n🇺🇸 Chase KALISZ\n🇭🇺
-  Gabor ZOMBORI\n🇫🇷 Leon MARCHAND\n🇳🇿 Lewis CLAREBURT\n🇯🇵 MATSUSHITA
-  Tomoyuki\n🇬🇧 Max LITCHFIELD\n🇯🇵 SETO Daiya\n🇨🇦 Tristan
-  JANKOVICS\n🇦🇺 William Campbell PETRIC\n🇨🇳 ZHANG Zhanshuo
+DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇳🇿 NZL\n🇺🇸 USA
 SUMMARY:🏊 Men's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -71,22 +44,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -95,12 +59,9 @@ UID:20240728T193200Z-swimming-MENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240728T193200Z
 DTSTART:20240728T193200Z
 DTEND:20240728T194400Z
-DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇬🇷 Apostolos
-  CHRISTOU\n🇨🇦 Blake TIERNEY\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert
-  KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇬🇧 Jonny
-  MARSHALL\n🇵🇱 Ksawery MASIUK\n🇫🇷 Mewen TOMAC\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇺🇸 Ryan MURPHY\n🇮🇹
-  Thomas CECCON\n🇨🇳 XU Jiayu\n🇫🇷 Yohann NDOYE-BROUARD
+DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹 ITA\n🇵🇱
+  POL\n🇿🇦 RSA\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -109,17 +70,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -169,16 +124,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -187,13 +136,9 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/GRN.ics b/docs/swimming/GRN.ics
index 1f0df2412..690daf816 100644
--- a/docs/swimming/GRN.ics
+++ b/docs/swimming/GRN.ics
@@ -8,22 +8,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/GUA.ics b/docs/swimming/GUA.ics
index 4e6724526..b3ce32a3f 100644
--- a/docs/swimming/GUA.ics
+++ b/docs/swimming/GUA.ics
@@ -8,18 +8,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/GUY.ics b/docs/swimming/GUY.ics
index d83d1fb25..302b6790c 100644
--- a/docs/swimming/GUY.ics
+++ b/docs/swimming/GUY.ics
@@ -8,19 +8,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/HAI.ics b/docs/swimming/HAI.ics
index 2d8d5bc78..24933f820 100644
--- a/docs/swimming/HAI.ics
+++ b/docs/swimming/HAI.ics
@@ -8,18 +8,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/HKG.ics b/docs/swimming/HKG.ics
index d9935c367..e08a97126 100644
--- a/docs/swimming/HKG.ics
+++ b/docs/swimming/HKG.ics
@@ -8,27 +8,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -37,18 +20,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -57,13 +33,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -72,18 +44,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/HON.ics b/docs/swimming/HON.ics
index 343ecfc8c..c327af6fa 100644
--- a/docs/swimming/HON.ics
+++ b/docs/swimming/HON.ics
@@ -8,18 +8,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/HUN.ics b/docs/swimming/HUN.ics
index 0a3477dc8..d5be7350c 100644
--- a/docs/swimming/HUN.ics
+++ b/docs/swimming/HUN.ics
@@ -8,14 +8,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -24,19 +20,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -45,27 +34,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -74,27 +46,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -113,16 +68,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -131,12 +80,9 @@ UID:20240728T091500Z-swimming-MENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240728T091500Z
 DTSTART:20240728T091500Z
 DTEND:20240728T092700Z
-DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇮🇹 Alberto
-  RAZZETTI\n🇬🇷 Apostolos PAPASTAMOS\n🇭🇺 Balazs HOLLO\n🇦🇺 Brendon
-  SMITH\n🇺🇸 Carson FOSTER\n🇩🇪 Cedric BUESSING\n🇺🇸 Chase KALISZ\n🇭🇺
-  Gabor ZOMBORI\n🇫🇷 Leon MARCHAND\n🇳🇿 Lewis CLAREBURT\n🇯🇵 MATSUSHITA
-  Tomoyuki\n🇬🇧 Max LITCHFIELD\n🇯🇵 SETO Daiya\n🇨🇦 Tristan
-  JANKOVICS\n🇦🇺 William Campbell PETRIC\n🇨🇳 ZHANG Zhanshuo
+DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇳🇿 NZL\n🇺🇸 USA
 SUMMARY:🏊 Men's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -145,22 +91,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -169,18 +106,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -189,12 +119,9 @@ UID:20240728T193200Z-swimming-MENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240728T193200Z
 DTSTART:20240728T193200Z
 DTEND:20240728T194400Z
-DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇬🇷 Apostolos
-  CHRISTOU\n🇨🇦 Blake TIERNEY\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert
-  KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇬🇧 Jonny
-  MARSHALL\n🇵🇱 Ksawery MASIUK\n🇫🇷 Mewen TOMAC\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇺🇸 Ryan MURPHY\n🇮🇹
-  Thomas CECCON\n🇨🇳 XU Jiayu\n🇫🇷 Yohann NDOYE-BROUARD
+DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹 ITA\n🇵🇱
+  POL\n🇿🇦 RSA\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -203,13 +130,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -218,12 +141,9 @@ UID:20240729T090000Z-swimming-WOMENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240729T090000Z
 DTSTART:20240729T090000Z
 DTEND:20240729T091200Z
-DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇮🇱
-  Anastasia GORBENKO\n🇷🇸 Anja CREVAR\n🇨🇦 Ella JANSEN\n🇦🇺 Ella
-  RAMSAY\n🇮🇪 Ellen WALSHE\n🇪🇸 Emma CARRASCO CADENS\n🇺🇸 Emma
-  WEYANT\n🇬🇧 Freya Constance COLBERT\n🇦🇺 Jenna FORRESTER\n🇺🇸 Katie
-  GRIMES\n🇬🇧 Katie SHANAHAN\n🇯🇵 NARITA Mio\n🇮🇹 Sara FRANCESCHI\n🇨🇦
-  Summer McINTOSH\n🇯🇵 TANIGAWA Ageha\n🇭🇺 Vivien JACKL
+DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵
+  JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -232,17 +152,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -346,16 +260,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -364,13 +272,9 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/IND.ics b/docs/swimming/IND.ics
index c7bf08c2a..7da3e2cf7 100644
--- a/docs/swimming/IND.ics
+++ b/docs/swimming/IND.ics
@@ -8,22 +8,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -32,18 +23,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/IRL.ics b/docs/swimming/IRL.ics
index d50068fbc..189f13829 100644
--- a/docs/swimming/IRL.ics
+++ b/docs/swimming/IRL.ics
@@ -8,18 +8,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,27 +21,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -57,18 +33,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -77,12 +47,9 @@ UID:20240728T191000Z-swimming-WOMENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240728T191000Z
 DTSTART:20240728T191000Z
 DTEND:20240728T192200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇬🇧 Angharad
-  EVANS\n🇮🇹 Benedetta PILATO\n🇪🇪 Eneli JEFIMOVA\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇦🇷 Macarena
-  CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI
-  Satomi\n🇸🇪 Sophie HANSSON\n🇨🇳 TANG Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱
-  Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇦🇷 ARG\n🇨🇳
+  CHN\n🇪🇪 EST\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱
+  NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -91,12 +58,9 @@ UID:20240729T090000Z-swimming-WOMENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240729T090000Z
 DTSTART:20240729T090000Z
 DTEND:20240729T091200Z
-DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇮🇱
-  Anastasia GORBENKO\n🇷🇸 Anja CREVAR\n🇨🇦 Ella JANSEN\n🇦🇺 Ella
-  RAMSAY\n🇮🇪 Ellen WALSHE\n🇪🇸 Emma CARRASCO CADENS\n🇺🇸 Emma
-  WEYANT\n🇬🇧 Freya Constance COLBERT\n🇦🇺 Jenna FORRESTER\n🇺🇸 Katie
-  GRIMES\n🇬🇧 Katie SHANAHAN\n🇯🇵 NARITA Mio\n🇮🇹 Sara FRANCESCHI\n🇨🇦
-  Summer McINTOSH\n🇯🇵 TANIGAWA Ageha\n🇭🇺 Vivien JACKL
+DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵
+  JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -105,18 +69,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -125,17 +82,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -156,12 +107,9 @@ UID:20240729T190100Z-swimming-WOMENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240729T190100Z
 DTSTART:20240729T190100Z
 DTEND:20240729T191500Z
-DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇫🇷 Beryl
-  GASTALDELLO\n🇪🇸 Carmen WEILER SASTRE\n🇮🇪 Danielle HILL\n🇫🇷 Emma
-  TEREBO\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪
-  Louise HANSSON\n🇳🇱 Maaike de WAARD\n🇺🇸 Regan SMITH\n🇧🇪 Roos
-  VANOTTERDIJK\n🇨🇳 WAN Letian\n🇨🇳 WANG Xueer
+DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇮🇪 IRL\n🇳🇱 NED\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -193,14 +141,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/ISL.ics b/docs/swimming/ISL.ics
index ccb74571b..cc849b727 100644
--- a/docs/swimming/ISL.ics
+++ b/docs/swimming/ISL.ics
@@ -8,18 +8,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,18 +21,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -48,13 +34,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/ISR.ics b/docs/swimming/ISR.ics
index b05527df5..ee61ca86d 100644
--- a/docs/swimming/ISR.ics
+++ b/docs/swimming/ISR.ics
@@ -8,18 +8,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,27 +21,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -57,11 +33,8 @@ UID:20240727T191200Z-swimming-MENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240727T191200Z
 DTSTART:20240727T191200Z
 DTEND:20240727T202600Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇬🇧 Adam
-  PEATY\n🇳🇱 Arno KAMMINGA\n🇦🇹 Bernhard REITSHAMMER\n🇳🇱 Caspar
-  CORBEAU\n🇺🇸 Charlie SWANSON\n🇬🇧 James WILBY\n🇦🇺 Joshua YONG\n🇩🇪
-  Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇩🇪 Melvin IMOUDU\n🇺🇸
-  Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN Haiyang\n🇮🇱 Ron POLONSKY
+DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇳🇱 NED\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -70,16 +43,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -88,18 +55,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -108,22 +69,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -132,18 +84,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -152,12 +97,9 @@ UID:20240728T184600Z-swimming-MENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T184600Z
 DTSTART:20240728T184600Z
 DTEND:20240728T190000Z
-DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇮🇹 Alessandro
-  RAGAINI\n🇱🇹 Danas RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧
-  Duncan SCOTT\n🇮🇹 Filippo MEGLI\n🇰🇷 HWANG Sunwoo\n🇰🇷 KIM
-  Woomin\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵
-  MATSUMOTO Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian
-  GIULIANI\n🇩🇪 Rafael MIROSLAW\n🇦🇺 Thomas NEILL
+DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹
+  LTU\n🇷🇴 ROU\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -166,12 +108,9 @@ UID:20240729T090000Z-swimming-WOMENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240729T090000Z
 DTSTART:20240729T090000Z
 DTEND:20240729T091200Z
-DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇮🇱
-  Anastasia GORBENKO\n🇷🇸 Anja CREVAR\n🇨🇦 Ella JANSEN\n🇦🇺 Ella
-  RAMSAY\n🇮🇪 Ellen WALSHE\n🇪🇸 Emma CARRASCO CADENS\n🇺🇸 Emma
-  WEYANT\n🇬🇧 Freya Constance COLBERT\n🇦🇺 Jenna FORRESTER\n🇺🇸 Katie
-  GRIMES\n🇬🇧 Katie SHANAHAN\n🇯🇵 NARITA Mio\n🇮🇹 Sara FRANCESCHI\n🇨🇦
-  Summer McINTOSH\n🇯🇵 TANIGAWA Ageha\n🇭🇺 Vivien JACKL
+DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵
+  JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -180,18 +119,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -274,16 +206,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/ISV.ics b/docs/swimming/ISV.ics
index 06a890e64..9e3197bd4 100644
--- a/docs/swimming/ISV.ics
+++ b/docs/swimming/ISV.ics
@@ -8,14 +8,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -24,22 +20,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/ITA.ics b/docs/swimming/ITA.ics
index 007b8c19e..d7a111a3f 100644
--- a/docs/swimming/ITA.ics
+++ b/docs/swimming/ITA.ics
@@ -8,18 +8,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,18 +21,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -48,19 +34,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -69,27 +48,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -98,27 +60,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -127,11 +72,8 @@ UID:20240727T191200Z-swimming-MENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240727T191200Z
 DTSTART:20240727T191200Z
 DTEND:20240727T202600Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇬🇧 Adam
-  PEATY\n🇳🇱 Arno KAMMINGA\n🇦🇹 Bernhard REITSHAMMER\n🇳🇱 Caspar
-  CORBEAU\n🇺🇸 Charlie SWANSON\n🇬🇧 James WILBY\n🇦🇺 Joshua YONG\n🇩🇪
-  Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇩🇪 Melvin IMOUDU\n🇺🇸
-  Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN Haiyang\n🇮🇱 Ron POLONSKY
+DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇳🇱 NED\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -169,16 +111,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -187,12 +123,9 @@ UID:20240728T091500Z-swimming-MENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240728T091500Z
 DTSTART:20240728T091500Z
 DTEND:20240728T092700Z
-DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇮🇹 Alberto
-  RAZZETTI\n🇬🇷 Apostolos PAPASTAMOS\n🇭🇺 Balazs HOLLO\n🇦🇺 Brendon
-  SMITH\n🇺🇸 Carson FOSTER\n🇩🇪 Cedric BUESSING\n🇺🇸 Chase KALISZ\n🇭🇺
-  Gabor ZOMBORI\n🇫🇷 Leon MARCHAND\n🇳🇿 Lewis CLAREBURT\n🇯🇵 MATSUSHITA
-  Tomoyuki\n🇬🇧 Max LITCHFIELD\n🇯🇵 SETO Daiya\n🇨🇦 Tristan
-  JANKOVICS\n🇦🇺 William Campbell PETRIC\n🇨🇳 ZHANG Zhanshuo
+DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇳🇿 NZL\n🇺🇸 USA
 SUMMARY:🏊 Men's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -201,18 +134,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -221,22 +148,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -257,12 +175,9 @@ UID:20240728T184600Z-swimming-MENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T184600Z
 DTSTART:20240728T184600Z
 DTEND:20240728T190000Z
-DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇮🇹 Alessandro
-  RAGAINI\n🇱🇹 Danas RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧
-  Duncan SCOTT\n🇮🇹 Filippo MEGLI\n🇰🇷 HWANG Sunwoo\n🇰🇷 KIM
-  Woomin\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵
-  MATSUMOTO Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian
-  GIULIANI\n🇩🇪 Rafael MIROSLAW\n🇦🇺 Thomas NEILL
+DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹
+  LTU\n🇷🇴 ROU\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -271,12 +186,9 @@ UID:20240728T191000Z-swimming-WOMENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240728T191000Z
 DTSTART:20240728T191000Z
 DTEND:20240728T192200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇬🇧 Angharad
-  EVANS\n🇮🇹 Benedetta PILATO\n🇪🇪 Eneli JEFIMOVA\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇦🇷 Macarena
-  CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI
-  Satomi\n🇸🇪 Sophie HANSSON\n🇨🇳 TANG Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱
-  Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇦🇷 ARG\n🇨🇳
+  CHN\n🇪🇪 EST\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱
+  NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -285,12 +197,9 @@ UID:20240728T193200Z-swimming-MENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240728T193200Z
 DTSTART:20240728T193200Z
 DTEND:20240728T194400Z
-DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇬🇷 Apostolos
-  CHRISTOU\n🇨🇦 Blake TIERNEY\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert
-  KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇬🇧 Jonny
-  MARSHALL\n🇵🇱 Ksawery MASIUK\n🇫🇷 Mewen TOMAC\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇺🇸 Ryan MURPHY\n🇮🇹
-  Thomas CECCON\n🇨🇳 XU Jiayu\n🇫🇷 Yohann NDOYE-BROUARD
+DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹 ITA\n🇵🇱
+  POL\n🇿🇦 RSA\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -310,12 +219,9 @@ UID:20240729T090000Z-swimming-WOMENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240729T090000Z
 DTSTART:20240729T090000Z
 DTEND:20240729T091200Z
-DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇮🇱
-  Anastasia GORBENKO\n🇷🇸 Anja CREVAR\n🇨🇦 Ella JANSEN\n🇦🇺 Ella
-  RAMSAY\n🇮🇪 Ellen WALSHE\n🇪🇸 Emma CARRASCO CADENS\n🇺🇸 Emma
-  WEYANT\n🇬🇧 Freya Constance COLBERT\n🇦🇺 Jenna FORRESTER\n🇺🇸 Katie
-  GRIMES\n🇬🇧 Katie SHANAHAN\n🇯🇵 NARITA Mio\n🇮🇹 Sara FRANCESCHI\n🇨🇦
-  Summer McINTOSH\n🇯🇵 TANIGAWA Ageha\n🇭🇺 Vivien JACKL
+DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵
+  JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -324,17 +230,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -502,14 +402,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -518,16 +414,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/JOR.ics b/docs/swimming/JOR.ics
index cdc0dd24f..a991186c6 100644
--- a/docs/swimming/JOR.ics
+++ b/docs/swimming/JOR.ics
@@ -8,14 +8,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/JPN.ics b/docs/swimming/JPN.ics
index 11a4888d4..aa810c565 100644
--- a/docs/swimming/JPN.ics
+++ b/docs/swimming/JPN.ics
@@ -8,18 +8,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,14 +21,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -44,18 +33,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -64,12 +46,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -78,16 +57,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -96,12 +69,9 @@ UID:20240728T091500Z-swimming-MENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240728T091500Z
 DTSTART:20240728T091500Z
 DTEND:20240728T092700Z
-DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇮🇹 Alberto
-  RAZZETTI\n🇬🇷 Apostolos PAPASTAMOS\n🇭🇺 Balazs HOLLO\n🇦🇺 Brendon
-  SMITH\n🇺🇸 Carson FOSTER\n🇩🇪 Cedric BUESSING\n🇺🇸 Chase KALISZ\n🇭🇺
-  Gabor ZOMBORI\n🇫🇷 Leon MARCHAND\n🇳🇿 Lewis CLAREBURT\n🇯🇵 MATSUSHITA
-  Tomoyuki\n🇬🇧 Max LITCHFIELD\n🇯🇵 SETO Daiya\n🇨🇦 Tristan
-  JANKOVICS\n🇦🇺 William Campbell PETRIC\n🇨🇳 ZHANG Zhanshuo
+DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇳🇿 NZL\n🇺🇸 USA
 SUMMARY:🏊 Men's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -110,18 +80,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -130,22 +94,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -178,12 +133,9 @@ UID:20240728T184600Z-swimming-MENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T184600Z
 DTSTART:20240728T184600Z
 DTEND:20240728T190000Z
-DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇮🇹 Alessandro
-  RAGAINI\n🇱🇹 Danas RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧
-  Duncan SCOTT\n🇮🇹 Filippo MEGLI\n🇰🇷 HWANG Sunwoo\n🇰🇷 KIM
-  Woomin\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵
-  MATSUMOTO Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian
-  GIULIANI\n🇩🇪 Rafael MIROSLAW\n🇦🇺 Thomas NEILL
+DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹
+  LTU\n🇷🇴 ROU\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -192,12 +144,9 @@ UID:20240728T191000Z-swimming-WOMENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240728T191000Z
 DTSTART:20240728T191000Z
 DTEND:20240728T192200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇬🇧 Angharad
-  EVANS\n🇮🇹 Benedetta PILATO\n🇪🇪 Eneli JEFIMOVA\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇦🇷 Macarena
-  CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI
-  Satomi\n🇸🇪 Sophie HANSSON\n🇨🇳 TANG Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱
-  Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇦🇷 ARG\n🇨🇳
+  CHN\n🇪🇪 EST\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱
+  NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -206,12 +155,9 @@ UID:20240729T090000Z-swimming-WOMENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240729T090000Z
 DTSTART:20240729T090000Z
 DTEND:20240729T091200Z
-DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇮🇱
-  Anastasia GORBENKO\n🇷🇸 Anja CREVAR\n🇨🇦 Ella JANSEN\n🇦🇺 Ella
-  RAMSAY\n🇮🇪 Ellen WALSHE\n🇪🇸 Emma CARRASCO CADENS\n🇺🇸 Emma
-  WEYANT\n🇬🇧 Freya Constance COLBERT\n🇦🇺 Jenna FORRESTER\n🇺🇸 Katie
-  GRIMES\n🇬🇧 Katie SHANAHAN\n🇯🇵 NARITA Mio\n🇮🇹 Sara FRANCESCHI\n🇨🇦
-  Summer McINTOSH\n🇯🇵 TANIGAWA Ageha\n🇭🇺 Vivien JACKL
+DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵
+  JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -346,14 +292,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -362,16 +304,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -380,13 +316,9 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/KAZ.ics b/docs/swimming/KAZ.ics
index 2ca232ddb..f04c8fc4d 100644
--- a/docs/swimming/KAZ.ics
+++ b/docs/swimming/KAZ.ics
@@ -8,18 +8,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/KEN.ics b/docs/swimming/KEN.ics
index 7bf225cf1..1a74c118b 100644
--- a/docs/swimming/KEN.ics
+++ b/docs/swimming/KEN.ics
@@ -8,19 +8,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/KGZ.ics b/docs/swimming/KGZ.ics
index 1d6aee47f..d86eab412 100644
--- a/docs/swimming/KGZ.ics
+++ b/docs/swimming/KGZ.ics
@@ -8,18 +8,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/KOR.ics b/docs/swimming/KOR.ics
index 4c795d87d..1ec850ddf 100644
--- a/docs/swimming/KOR.ics
+++ b/docs/swimming/KOR.ics
@@ -8,18 +8,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,19 +21,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -61,16 +47,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -79,22 +59,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -103,12 +74,9 @@ UID:20240728T184600Z-swimming-MENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T184600Z
 DTSTART:20240728T184600Z
 DTEND:20240728T190000Z
-DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇮🇹 Alessandro
-  RAGAINI\n🇱🇹 Danas RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧
-  Duncan SCOTT\n🇮🇹 Filippo MEGLI\n🇰🇷 HWANG Sunwoo\n🇰🇷 KIM
-  Woomin\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵
-  MATSUMOTO Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian
-  GIULIANI\n🇩🇪 Rafael MIROSLAW\n🇦🇺 Thomas NEILL
+DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹
+  LTU\n🇷🇴 ROU\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -254,16 +222,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/KSA.ics b/docs/swimming/KSA.ics
index 24b6ffd1a..387195745 100644
--- a/docs/swimming/KSA.ics
+++ b/docs/swimming/KSA.ics
@@ -8,18 +8,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/KUW.ics b/docs/swimming/KUW.ics
index 7eeac3988..bf951841b 100644
--- a/docs/swimming/KUW.ics
+++ b/docs/swimming/KUW.ics
@@ -8,18 +8,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/LAO.ics b/docs/swimming/LAO.ics
index 0492e43b3..621a62478 100644
--- a/docs/swimming/LAO.ics
+++ b/docs/swimming/LAO.ics
@@ -8,18 +8,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,18 +21,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/LBA.ics b/docs/swimming/LBA.ics
index 8ec22ef58..1cff59b4a 100644
--- a/docs/swimming/LBA.ics
+++ b/docs/swimming/LBA.ics
@@ -8,18 +8,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/LBN.ics b/docs/swimming/LBN.ics
index a58ae76e0..7f4218625 100644
--- a/docs/swimming/LBN.ics
+++ b/docs/swimming/LBN.ics
@@ -8,18 +8,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/LTU.ics b/docs/swimming/LTU.ics
index f5b805d54..6e059b44e 100644
--- a/docs/swimming/LTU.ics
+++ b/docs/swimming/LTU.ics
@@ -8,18 +8,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,19 +21,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -49,16 +35,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -67,18 +47,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -87,12 +61,9 @@ UID:20240728T184600Z-swimming-MENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T184600Z
 DTSTART:20240728T184600Z
 DTEND:20240728T190000Z
-DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇮🇹 Alessandro
-  RAGAINI\n🇱🇹 Danas RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧
-  Duncan SCOTT\n🇮🇹 Filippo MEGLI\n🇰🇷 HWANG Sunwoo\n🇰🇷 KIM
-  Woomin\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵
-  MATSUMOTO Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian
-  GIULIANI\n🇩🇪 Rafael MIROSLAW\n🇦🇺 Thomas NEILL
+DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹
+  LTU\n🇷🇴 ROU\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -101,12 +72,9 @@ UID:20240728T191000Z-swimming-WOMENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240728T191000Z
 DTSTART:20240728T191000Z
 DTEND:20240728T192200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇬🇧 Angharad
-  EVANS\n🇮🇹 Benedetta PILATO\n🇪🇪 Eneli JEFIMOVA\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇦🇷 Macarena
-  CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI
-  Satomi\n🇸🇪 Sophie HANSSON\n🇨🇳 TANG Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱
-  Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇦🇷 ARG\n🇨🇳
+  CHN\n🇪🇪 EST\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱
+  NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -208,14 +176,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/MAD.ics b/docs/swimming/MAD.ics
index 78a87044e..03b72f797 100644
--- a/docs/swimming/MAD.ics
+++ b/docs/swimming/MAD.ics
@@ -8,18 +8,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/MAR.ics b/docs/swimming/MAR.ics
index 3ec6c26ea..412a0ca06 100644
--- a/docs/swimming/MAR.ics
+++ b/docs/swimming/MAR.ics
@@ -8,19 +8,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -29,18 +22,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/MAS.ics b/docs/swimming/MAS.ics
index 5f43253e5..f74b3dba9 100644
--- a/docs/swimming/MAS.ics
+++ b/docs/swimming/MAS.ics
@@ -8,19 +8,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -29,18 +22,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/MDA.ics b/docs/swimming/MDA.ics
index 757a629b8..6e90ba0c4 100644
--- a/docs/swimming/MDA.ics
+++ b/docs/swimming/MDA.ics
@@ -8,19 +8,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/MEX.ics b/docs/swimming/MEX.ics
index eaae0d30b..c8013e3ef 100644
--- a/docs/swimming/MEX.ics
+++ b/docs/swimming/MEX.ics
@@ -8,18 +8,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,16 +21,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -46,18 +33,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/MGL.ics b/docs/swimming/MGL.ics
index 2249e92f3..c8c5a6df4 100644
--- a/docs/swimming/MGL.ics
+++ b/docs/swimming/MGL.ics
@@ -8,18 +8,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/MKD.ics b/docs/swimming/MKD.ics
index d35e0b7bf..682362f48 100644
--- a/docs/swimming/MKD.ics
+++ b/docs/swimming/MKD.ics
@@ -8,19 +8,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/MON.ics b/docs/swimming/MON.ics
index dfd32edcd..145cf2f38 100644
--- a/docs/swimming/MON.ics
+++ b/docs/swimming/MON.ics
@@ -8,17 +8,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/MOZ.ics b/docs/swimming/MOZ.ics
index f301c26b6..c6289945b 100644
--- a/docs/swimming/MOZ.ics
+++ b/docs/swimming/MOZ.ics
@@ -8,18 +8,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,18 +21,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/NCA.ics b/docs/swimming/NCA.ics
index 8c3862c54..a5e29f8a1 100644
--- a/docs/swimming/NCA.ics
+++ b/docs/swimming/NCA.ics
@@ -8,18 +8,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/NED.ics b/docs/swimming/NED.ics
index 4e7cb39b8..98b659512 100644
--- a/docs/swimming/NED.ics
+++ b/docs/swimming/NED.ics
@@ -8,18 +8,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,18 +21,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -48,27 +34,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -77,12 +46,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -91,11 +57,8 @@ UID:20240727T191200Z-swimming-MENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240727T191200Z
 DTSTART:20240727T191200Z
 DTEND:20240727T202600Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇬🇧 Adam
-  PEATY\n🇳🇱 Arno KAMMINGA\n🇦🇹 Bernhard REITSHAMMER\n🇳🇱 Caspar
-  CORBEAU\n🇺🇸 Charlie SWANSON\n🇬🇧 James WILBY\n🇦🇺 Joshua YONG\n🇩🇪
-  Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇩🇪 Melvin IMOUDU\n🇺🇸
-  Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN Haiyang\n🇮🇱 Ron POLONSKY
+DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇳🇱 NED\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -104,18 +67,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -124,22 +81,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -148,12 +96,9 @@ UID:20240728T191000Z-swimming-WOMENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240728T191000Z
 DTSTART:20240728T191000Z
 DTEND:20240728T192200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇬🇧 Angharad
-  EVANS\n🇮🇹 Benedetta PILATO\n🇪🇪 Eneli JEFIMOVA\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇦🇷 Macarena
-  CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI
-  Satomi\n🇸🇪 Sophie HANSSON\n🇨🇳 TANG Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱
-  Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇦🇷 ARG\n🇨🇳
+  CHN\n🇪🇪 EST\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱
+  NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -173,18 +118,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -193,12 +131,9 @@ UID:20240729T190100Z-swimming-WOMENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240729T190100Z
 DTSTART:20240729T190100Z
 DTEND:20240729T191500Z
-DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇫🇷 Beryl
-  GASTALDELLO\n🇪🇸 Carmen WEILER SASTRE\n🇮🇪 Danielle HILL\n🇫🇷 Emma
-  TEREBO\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪
-  Louise HANSSON\n🇳🇱 Maaike de WAARD\n🇺🇸 Regan SMITH\n🇧🇪 Roos
-  VANOTTERDIJK\n🇨🇳 WAN Letian\n🇨🇳 WANG Xueer
+DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇮🇪 IRL\n🇳🇱 NED\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -306,14 +241,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -322,16 +253,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/NEP.ics b/docs/swimming/NEP.ics
index 44d8f3e54..93841ab2e 100644
--- a/docs/swimming/NEP.ics
+++ b/docs/swimming/NEP.ics
@@ -8,18 +8,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/NOR.ics b/docs/swimming/NOR.ics
index 65283cf70..75662788c 100644
--- a/docs/swimming/NOR.ics
+++ b/docs/swimming/NOR.ics
@@ -8,17 +8,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/NZL.ics b/docs/swimming/NZL.ics
index 61918bdcd..44ba6cc7d 100644
--- a/docs/swimming/NZL.ics
+++ b/docs/swimming/NZL.ics
@@ -8,18 +8,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,14 +21,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -56,12 +45,9 @@ UID:20240728T091500Z-swimming-MENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240728T091500Z
 DTSTART:20240728T091500Z
 DTEND:20240728T092700Z
-DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇮🇹 Alberto
-  RAZZETTI\n🇬🇷 Apostolos PAPASTAMOS\n🇭🇺 Balazs HOLLO\n🇦🇺 Brendon
-  SMITH\n🇺🇸 Carson FOSTER\n🇩🇪 Cedric BUESSING\n🇺🇸 Chase KALISZ\n🇭🇺
-  Gabor ZOMBORI\n🇫🇷 Leon MARCHAND\n🇳🇿 Lewis CLAREBURT\n🇯🇵 MATSUSHITA
-  Tomoyuki\n🇬🇧 Max LITCHFIELD\n🇯🇵 SETO Daiya\n🇨🇦 Tristan
-  JANKOVICS\n🇦🇺 William Campbell PETRIC\n🇨🇳 ZHANG Zhanshuo
+DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇳🇿 NZL\n🇺🇸 USA
 SUMMARY:🏊 Men's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -70,22 +56,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -94,18 +71,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -126,13 +96,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -220,16 +186,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/PAK.ics b/docs/swimming/PAK.ics
index e88fc7735..a7c8a281c 100644
--- a/docs/swimming/PAK.ics
+++ b/docs/swimming/PAK.ics
@@ -8,16 +8,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -26,18 +20,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/PAN.ics b/docs/swimming/PAN.ics
index 1163724a7..b419dc1cd 100644
--- a/docs/swimming/PAN.ics
+++ b/docs/swimming/PAN.ics
@@ -8,18 +8,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/PAR.ics b/docs/swimming/PAR.ics
index 614c8f5e9..c98be16c2 100644
--- a/docs/swimming/PAR.ics
+++ b/docs/swimming/PAR.ics
@@ -8,18 +8,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/PER.ics b/docs/swimming/PER.ics
index 9ea4b6823..8edab18df 100644
--- a/docs/swimming/PER.ics
+++ b/docs/swimming/PER.ics
@@ -8,19 +8,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/PLE.ics b/docs/swimming/PLE.ics
index 854d2b0a2..71863fac7 100644
--- a/docs/swimming/PLE.ics
+++ b/docs/swimming/PLE.ics
@@ -8,22 +8,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/POL.ics b/docs/swimming/POL.ics
index 6f396d701..6b0556752 100644
--- a/docs/swimming/POL.ics
+++ b/docs/swimming/POL.ics
@@ -8,18 +8,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,27 +21,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -57,27 +33,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -86,18 +45,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -106,22 +59,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -130,12 +74,9 @@ UID:20240728T193200Z-swimming-MENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240728T193200Z
 DTSTART:20240728T193200Z
 DTEND:20240728T194400Z
-DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇬🇷 Apostolos
-  CHRISTOU\n🇨🇦 Blake TIERNEY\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert
-  KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇬🇧 Jonny
-  MARSHALL\n🇵🇱 Ksawery MASIUK\n🇫🇷 Mewen TOMAC\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇺🇸 Ryan MURPHY\n🇮🇹
-  Thomas CECCON\n🇨🇳 XU Jiayu\n🇫🇷 Yohann NDOYE-BROUARD
+DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹 ITA\n🇵🇱
+  POL\n🇿🇦 RSA\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -144,18 +85,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -267,16 +201,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/POR.ics b/docs/swimming/POR.ics
index d28428177..3fe141675 100644
--- a/docs/swimming/POR.ics
+++ b/docs/swimming/POR.ics
@@ -8,22 +8,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/PUR.ics b/docs/swimming/PUR.ics
index 3745a8d3b..c5cc90e91 100644
--- a/docs/swimming/PUR.ics
+++ b/docs/swimming/PUR.ics
@@ -8,22 +8,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -32,16 +23,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/QAT.ics b/docs/swimming/QAT.ics
index 99d039486..ac1e70e78 100644
--- a/docs/swimming/QAT.ics
+++ b/docs/swimming/QAT.ics
@@ -8,18 +8,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/ROU.ics b/docs/swimming/ROU.ics
index 890628ba1..bbfdfbaab 100644
--- a/docs/swimming/ROU.ics
+++ b/docs/swimming/ROU.ics
@@ -8,16 +8,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -26,18 +20,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -46,12 +33,9 @@ UID:20240728T184600Z-swimming-MENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T184600Z
 DTSTART:20240728T184600Z
 DTEND:20240728T190000Z
-DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇮🇹 Alessandro
-  RAGAINI\n🇱🇹 Danas RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧
-  Duncan SCOTT\n🇮🇹 Filippo MEGLI\n🇰🇷 HWANG Sunwoo\n🇰🇷 KIM
-  Woomin\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵
-  MATSUMOTO Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian
-  GIULIANI\n🇩🇪 Rafael MIROSLAW\n🇦🇺 Thomas NEILL
+DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹
+  LTU\n🇷🇴 ROU\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -60,13 +44,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -75,17 +55,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/RSA.ics b/docs/swimming/RSA.ics
index f84a333a8..90a391222 100644
--- a/docs/swimming/RSA.ics
+++ b/docs/swimming/RSA.ics
@@ -8,18 +8,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,12 +21,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -42,18 +32,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -62,22 +46,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -86,18 +61,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -106,12 +74,9 @@ UID:20240728T191000Z-swimming-WOMENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240728T191000Z
 DTSTART:20240728T191000Z
 DTEND:20240728T192200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇬🇧 Angharad
-  EVANS\n🇮🇹 Benedetta PILATO\n🇪🇪 Eneli JEFIMOVA\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇦🇷 Macarena
-  CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI
-  Satomi\n🇸🇪 Sophie HANSSON\n🇨🇳 TANG Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱
-  Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇦🇷 ARG\n🇨🇳
+  CHN\n🇪🇪 EST\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱
+  NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -120,12 +85,9 @@ UID:20240728T193200Z-swimming-MENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240728T193200Z
 DTSTART:20240728T193200Z
 DTEND:20240728T194400Z
-DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇬🇷 Apostolos
-  CHRISTOU\n🇨🇦 Blake TIERNEY\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert
-  KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇬🇧 Jonny
-  MARSHALL\n🇵🇱 Ksawery MASIUK\n🇫🇷 Mewen TOMAC\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇺🇸 Ryan MURPHY\n🇮🇹
-  Thomas CECCON\n🇨🇳 XU Jiayu\n🇫🇷 Yohann NDOYE-BROUARD
+DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹 ITA\n🇵🇱
+  POL\n🇿🇦 RSA\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -134,13 +96,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -190,14 +148,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -206,16 +160,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/SEN.ics b/docs/swimming/SEN.ics
index 73c1907a8..f580bdb32 100644
--- a/docs/swimming/SEN.ics
+++ b/docs/swimming/SEN.ics
@@ -8,18 +8,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/SGP.ics b/docs/swimming/SGP.ics
index 90451cc32..5ffb05a59 100644
--- a/docs/swimming/SGP.ics
+++ b/docs/swimming/SGP.ics
@@ -8,18 +8,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -77,14 +71,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/SLO.ics b/docs/swimming/SLO.ics
index 00a3ec2cb..7e892b7c7 100644
--- a/docs/swimming/SLO.ics
+++ b/docs/swimming/SLO.ics
@@ -8,27 +8,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -37,16 +20,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/SMR.ics b/docs/swimming/SMR.ics
index 844039eb9..5e7f89d6a 100644
--- a/docs/swimming/SMR.ics
+++ b/docs/swimming/SMR.ics
@@ -8,19 +8,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/SRB.ics b/docs/swimming/SRB.ics
index dcc238ef4..676e830bc 100644
--- a/docs/swimming/SRB.ics
+++ b/docs/swimming/SRB.ics
@@ -8,27 +8,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -37,16 +20,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -55,12 +32,9 @@ UID:20240729T090000Z-swimming-WOMENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240729T090000Z
 DTSTART:20240729T090000Z
 DTEND:20240729T091200Z
-DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇮🇱
-  Anastasia GORBENKO\n🇷🇸 Anja CREVAR\n🇨🇦 Ella JANSEN\n🇦🇺 Ella
-  RAMSAY\n🇮🇪 Ellen WALSHE\n🇪🇸 Emma CARRASCO CADENS\n🇺🇸 Emma
-  WEYANT\n🇬🇧 Freya Constance COLBERT\n🇦🇺 Jenna FORRESTER\n🇺🇸 Katie
-  GRIMES\n🇬🇧 Katie SHANAHAN\n🇯🇵 NARITA Mio\n🇮🇹 Sara FRANCESCHI\n🇨🇦
-  Summer McINTOSH\n🇯🇵 TANIGAWA Ageha\n🇭🇺 Vivien JACKL
+DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵
+  JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -118,13 +92,9 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/SRI.ics b/docs/swimming/SRI.ics
index 7ce600b42..1ea0f059c 100644
--- a/docs/swimming/SRI.ics
+++ b/docs/swimming/SRI.ics
@@ -8,18 +8,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/SUD.ics b/docs/swimming/SUD.ics
index 9cbcee39c..f1519c592 100644
--- a/docs/swimming/SUD.ics
+++ b/docs/swimming/SUD.ics
@@ -27,16 +27,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/SUI.ics b/docs/swimming/SUI.ics
index 9e45d067d..86f9ac9c7 100644
--- a/docs/swimming/SUI.ics
+++ b/docs/swimming/SUI.ics
@@ -8,19 +8,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -29,16 +22,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -47,18 +34,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -67,22 +48,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -152,14 +124,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -168,16 +136,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/SWE.ics b/docs/swimming/SWE.ics
index 6379a6a39..c736c1b2d 100644
--- a/docs/swimming/SWE.ics
+++ b/docs/swimming/SWE.ics
@@ -8,18 +8,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,19 +21,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -49,27 +35,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -78,27 +47,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -107,12 +59,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -131,18 +80,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -163,12 +106,9 @@ UID:20240728T191000Z-swimming-WOMENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240728T191000Z
 DTSTART:20240728T191000Z
 DTEND:20240728T192200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇬🇧 Angharad
-  EVANS\n🇮🇹 Benedetta PILATO\n🇪🇪 Eneli JEFIMOVA\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇦🇷 Macarena
-  CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI
-  Satomi\n🇸🇪 Sophie HANSSON\n🇨🇳 TANG Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱
-  Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇦🇷 ARG\n🇨🇳
+  CHN\n🇪🇪 EST\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱
+  NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -177,18 +117,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -197,17 +130,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -216,12 +143,9 @@ UID:20240729T190100Z-swimming-WOMENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240729T190100Z
 DTSTART:20240729T190100Z
 DTEND:20240729T191500Z
-DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇫🇷 Beryl
-  GASTALDELLO\n🇪🇸 Carmen WEILER SASTRE\n🇮🇪 Danielle HILL\n🇫🇷 Emma
-  TEREBO\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪
-  Louise HANSSON\n🇳🇱 Maaike de WAARD\n🇺🇸 Regan SMITH\n🇧🇪 Roos
-  VANOTTERDIJK\n🇨🇳 WAN Letian\n🇨🇳 WANG Xueer
+DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇮🇪 IRL\n🇳🇱 NED\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -329,14 +253,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/SWZ.ics b/docs/swimming/SWZ.ics
index 4dcae97ab..063f068d2 100644
--- a/docs/swimming/SWZ.ics
+++ b/docs/swimming/SWZ.ics
@@ -8,18 +8,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,18 +21,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/SYR.ics b/docs/swimming/SYR.ics
index 9aa1bc119..a96ea8386 100644
--- a/docs/swimming/SYR.ics
+++ b/docs/swimming/SYR.ics
@@ -8,16 +8,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/TGA.ics b/docs/swimming/TGA.ics
index bab1b192d..73b7b57cb 100644
--- a/docs/swimming/TGA.ics
+++ b/docs/swimming/TGA.ics
@@ -8,22 +8,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/TKM.ics b/docs/swimming/TKM.ics
index df3ba5c5f..a8a0b7355 100644
--- a/docs/swimming/TKM.ics
+++ b/docs/swimming/TKM.ics
@@ -8,18 +8,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/TTO.ics b/docs/swimming/TTO.ics
index 6b7e3c919..e7e0346e3 100644
--- a/docs/swimming/TTO.ics
+++ b/docs/swimming/TTO.ics
@@ -8,18 +8,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/TUN.ics b/docs/swimming/TUN.ics
index 01392939d..85cdaacb2 100644
--- a/docs/swimming/TUN.ics
+++ b/docs/swimming/TUN.ics
@@ -8,19 +8,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -29,17 +22,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/TUR.ics b/docs/swimming/TUR.ics
index a96f7ec4b..e04b302dc 100644
--- a/docs/swimming/TUR.ics
+++ b/docs/swimming/TUR.ics
@@ -8,18 +8,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,22 +21,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -52,17 +36,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/UAE.ics b/docs/swimming/UAE.ics
index 29f8dd5a8..c205ba42f 100644
--- a/docs/swimming/UAE.ics
+++ b/docs/swimming/UAE.ics
@@ -8,18 +8,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/UKR.ics b/docs/swimming/UKR.ics
index ae8082076..6788f8ba8 100644
--- a/docs/swimming/UKR.ics
+++ b/docs/swimming/UKR.ics
@@ -8,22 +8,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -32,18 +23,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -52,17 +36,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -89,16 +67,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/USA.ics b/docs/swimming/USA.ics
index d999724b0..64c714398 100644
--- a/docs/swimming/USA.ics
+++ b/docs/swimming/USA.ics
@@ -8,18 +8,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,14 +21,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -44,18 +33,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -64,19 +46,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -85,27 +60,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -114,27 +72,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -143,12 +84,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -181,11 +119,8 @@ UID:20240727T191200Z-swimming-MENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240727T191200Z
 DTSTART:20240727T191200Z
 DTEND:20240727T202600Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇬🇧 Adam
-  PEATY\n🇳🇱 Arno KAMMINGA\n🇦🇹 Bernhard REITSHAMMER\n🇳🇱 Caspar
-  CORBEAU\n🇺🇸 Charlie SWANSON\n🇬🇧 James WILBY\n🇦🇺 Joshua YONG\n🇩🇪
-  Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇩🇪 Melvin IMOUDU\n🇺🇸
-  Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN Haiyang\n🇮🇱 Ron POLONSKY
+DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇳🇱 NED\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -214,16 +149,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -232,12 +161,9 @@ UID:20240728T091500Z-swimming-MENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240728T091500Z
 DTSTART:20240728T091500Z
 DTEND:20240728T092700Z
-DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇮🇹 Alberto
-  RAZZETTI\n🇬🇷 Apostolos PAPASTAMOS\n🇭🇺 Balazs HOLLO\n🇦🇺 Brendon
-  SMITH\n🇺🇸 Carson FOSTER\n🇩🇪 Cedric BUESSING\n🇺🇸 Chase KALISZ\n🇭🇺
-  Gabor ZOMBORI\n🇫🇷 Leon MARCHAND\n🇳🇿 Lewis CLAREBURT\n🇯🇵 MATSUSHITA
-  Tomoyuki\n🇬🇧 Max LITCHFIELD\n🇯🇵 SETO Daiya\n🇨🇦 Tristan
-  JANKOVICS\n🇦🇺 William Campbell PETRIC\n🇨🇳 ZHANG Zhanshuo
+DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇳🇿 NZL\n🇺🇸 USA
 SUMMARY:🏊 Men's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -246,18 +172,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -266,22 +186,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -290,18 +201,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -334,12 +238,9 @@ UID:20240728T184600Z-swimming-MENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T184600Z
 DTSTART:20240728T184600Z
 DTEND:20240728T190000Z
-DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇮🇹 Alessandro
-  RAGAINI\n🇱🇹 Danas RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧
-  Duncan SCOTT\n🇮🇹 Filippo MEGLI\n🇰🇷 HWANG Sunwoo\n🇰🇷 KIM
-  Woomin\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵
-  MATSUMOTO Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian
-  GIULIANI\n🇩🇪 Rafael MIROSLAW\n🇦🇺 Thomas NEILL
+DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹
+  LTU\n🇷🇴 ROU\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -348,12 +249,9 @@ UID:20240728T191000Z-swimming-WOMENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240728T191000Z
 DTSTART:20240728T191000Z
 DTEND:20240728T192200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇬🇧 Angharad
-  EVANS\n🇮🇹 Benedetta PILATO\n🇪🇪 Eneli JEFIMOVA\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇦🇷 Macarena
-  CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI
-  Satomi\n🇸🇪 Sophie HANSSON\n🇨🇳 TANG Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱
-  Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇦🇷 ARG\n🇨🇳
+  CHN\n🇪🇪 EST\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱
+  NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -362,12 +260,9 @@ UID:20240728T193200Z-swimming-MENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240728T193200Z
 DTSTART:20240728T193200Z
 DTEND:20240728T194400Z
-DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇬🇷 Apostolos
-  CHRISTOU\n🇨🇦 Blake TIERNEY\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert
-  KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇬🇧 Jonny
-  MARSHALL\n🇵🇱 Ksawery MASIUK\n🇫🇷 Mewen TOMAC\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇺🇸 Ryan MURPHY\n🇮🇹
-  Thomas CECCON\n🇨🇳 XU Jiayu\n🇫🇷 Yohann NDOYE-BROUARD
+DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹 ITA\n🇵🇱
+  POL\n🇿🇦 RSA\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -387,13 +282,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -402,12 +293,9 @@ UID:20240729T090000Z-swimming-WOMENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240729T090000Z
 DTSTART:20240729T090000Z
 DTEND:20240729T091200Z
-DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇮🇱
-  Anastasia GORBENKO\n🇷🇸 Anja CREVAR\n🇨🇦 Ella JANSEN\n🇦🇺 Ella
-  RAMSAY\n🇮🇪 Ellen WALSHE\n🇪🇸 Emma CARRASCO CADENS\n🇺🇸 Emma
-  WEYANT\n🇬🇧 Freya Constance COLBERT\n🇦🇺 Jenna FORRESTER\n🇺🇸 Katie
-  GRIMES\n🇬🇧 Katie SHANAHAN\n🇯🇵 NARITA Mio\n🇮🇹 Sara FRANCESCHI\n🇨🇦
-  Summer McINTOSH\n🇯🇵 TANIGAWA Ageha\n🇭🇺 Vivien JACKL
+DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵
+  JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -416,18 +304,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -436,17 +317,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -479,12 +354,9 @@ UID:20240729T190100Z-swimming-WOMENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240729T190100Z
 DTSTART:20240729T190100Z
 DTEND:20240729T191500Z
-DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇫🇷 Beryl
-  GASTALDELLO\n🇪🇸 Carmen WEILER SASTRE\n🇮🇪 Danielle HILL\n🇫🇷 Emma
-  TEREBO\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪
-  Louise HANSSON\n🇳🇱 Maaike de WAARD\n🇺🇸 Regan SMITH\n🇧🇪 Roos
-  VANOTTERDIJK\n🇨🇳 WAN Letian\n🇨🇳 WANG Xueer
+DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇮🇪 IRL\n🇳🇱 NED\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -750,14 +622,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -766,16 +634,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -784,13 +646,9 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/UZB.ics b/docs/swimming/UZB.ics
index 4e10f4294..57bda02d3 100644
--- a/docs/swimming/UZB.ics
+++ b/docs/swimming/UZB.ics
@@ -8,14 +8,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -24,19 +20,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -45,17 +34,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/VEN.ics b/docs/swimming/VEN.ics
index 20a1e8ca4..64da8753f 100644
--- a/docs/swimming/VEN.ics
+++ b/docs/swimming/VEN.ics
@@ -8,19 +8,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -29,18 +22,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -49,17 +35,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/VIE.ics b/docs/swimming/VIE.ics
index a787db4dc..04618e5ba 100644
--- a/docs/swimming/VIE.ics
+++ b/docs/swimming/VIE.ics
@@ -8,17 +8,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/ZIM.ics b/docs/swimming/ZIM.ics
index 7125fb2fc..2d57f17e9 100644
--- a/docs/swimming/ZIM.ics
+++ b/docs/swimming/ZIM.ics
@@ -27,16 +27,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/swimming/general.ics b/docs/swimming/general.ics
index a18d11ceb..5a75cfa38 100644
--- a/docs/swimming/general.ics
+++ b/docs/swimming/general.ics
@@ -8,18 +8,11 @@ UID:20240727T090000Z-swimming-WOMENS-100M-BUTTERFLY-HEATS
 DTSTAMP:20240727T090000Z
 DTSTART:20240727T090000Z
 DTEND:20240727T091100Z
-DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇺 Alexandria
-  PERKINS\n🇬🇪 Ana NIZHARADZE\n🇩🇪 Angelina KOEHLER\n🇬🇷 Anna
-  NTOUNTOUNAKI\n🇨🇿 Barbora SEEMANOVA\n🇮🇹 Costanza COCCONCELLI\n🇮🇪
-  Ellen WALSHE\n🇦🇺 Emma McKEON\n🇿🇦 Erin GALLAGHER\n🇬🇷 Georgia
-  DAMASIOTI\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇸🇿 Hayley HOY\n🇩🇰
-  Helena Rosendahl BACH\n🇯🇵 IKEE Rikako\n🇬🇧 Keanna Louise
-  MACINNES\n🇧🇦 Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇸🇪 Louise
-  HANSSON\n🇵🇾 Luana ALONSO\n🇨🇦 Margaret MAC NEIL\n🇳🇮 Maria Victoria
-  SCHUTZMEIER\n🇫🇷 Marie WATTEL\n🇸🇳 Oumy DIOP\n🇨🇦 Rebecca SMITH\n🇧🇪
-  Roos VANOTTERDIJK\n🇳🇱 Tessa GIELE\n🇺🇸 Torri HUSKE\n🇳🇿 Vanessa Hazel
-  OUWEHAND\n🇦🇲 Varsenik MANUCHARYAN\n🇮🇹 Viola SCOTTO di CARLO\n🇨🇳
-  ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly - Heats\n🇦🇲 ARM\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿
+  CZE\n🇩🇰 DEN\n🇸🇿 SWZ\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇳🇱 NED\n🇳🇿 NZL\n🇳🇮 NCA\n🇵🇾
+  PAR\n🇸🇳 SEN\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -28,14 +21,10 @@ UID:20240727T091200Z-swimming-WOMENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T091200Z
 DTSTART:20240727T091200Z
 DTEND:20240727T093000Z
-DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 Agostina
-  HEIN\n🇭🇺 Ajna KESELY\n🇫🇷 Anastasiia KIRPICHNIKOVA\n🇺🇿 Anastasiya
-  ZELINSKAYA\n🇦🇺 Ariarne TITMUS\n🇳🇿 Erika FAIRWEATHER\n🇳🇿 Eve
-  THOMAS\n🇧🇷 Gabrielle RONCATTO\n🇩🇪 Isabel GOSE\n🇦🇺 Jamie
-  PERKINS\n🇯🇵 KOBORI Waka\n🇯🇴 Karin BELBEISI\n🇺🇸 Katie LEDECKY\n🇨🇳
-  LI Bingjie\n🇨🇳 LIU Yaxin\n🇩🇪 Leonie MAERTENS\n🇧🇷 Maria Fernanda
-  COSTA\n🇻🇮 Natalia Jean KUIPERS\n🇺🇸 Paige MADDEN\n🇨🇦 Summer
-  McINTOSH\n🇧🇪 Valentine DUMONT
+DESCRIPTION:Swimming - Women's 400m Freestyle - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇭🇺
+  HUN\n🇯🇵 JPN\n🇯🇴 JOR\n🇳🇿 NZL\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇮 Virgin
+  Islands, US
 SUMMARY:🏊 Women's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -44,18 +33,11 @@ UID:20240727T093000Z-swimming-MENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240727T093000Z
 DTSTART:20240727T093000Z
 DTEND:20240727T094400Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇶🇦 Abdulaziz
-  AL-OBAIDLY\n🇬🇧 Adam PEATY\n🇧🇼 Adrian ROBINSON\n🇭🇹 Alexandre
-  GRAND'PIERRE\n🇱🇹 Andrius SIDLAUSKAS\n🇮🇸 Anton McKEE\n🇳🇱 Arno
-  KAMMINGA\n🇹🇷 Berkay OGRETIR\n🇦🇹 Bernhard REITSHAMMER\n🇰🇷 CHOI
-  Dongyeol\n🇳🇱 Caspar CORBEAU\n🇸🇿 Chadd NG CHIU HING NING\n🇺🇸 Charlie
-  SWANSON\n🇰🇬 Denis PETRASHOV\n🇦🇬 Jadon WUILLIEZ\n🇬🇧 James
-  WILBY\n🇵🇱 Jan KALUSOWSKI\n🇲🇬 Jonathan RAHARVEL\n🇦🇺 Joshua
-  YONG\n🇩🇪 Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇲🇿 Matthew
-  LAWRENCE\n🇩🇪 Melvin IMOUDU\n🇦🇸 Micah MASEI\n🇲🇽 Miguel Alejandro de
-  LARA OJEDA\n🇺🇸 Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN
-  Haiyang\n🇮🇱 Ron POLONSKY\n🇨🇳 SUN Jiajun\n🇦🇺 Sam WILLIAMSON\n🇱🇦
-  Steven INSIXIENGMAY\n🇯🇵 TANIGUCHI Taku\n🇫🇲 Tasi LIMTIACO
+DESCRIPTION:Swimming - Men's 100m Breaststroke - Heats\n🇦🇸 ASA\n🇦🇬
+  ANT\n🇦🇺 AUS\n🇦🇹 AUT\n🇧🇼 BOT\n🇨🇳 CHN\n🇸🇿 SWZ\n🇩🇪 GER\n🇬🇧
+  GBR\n🇭🇹 HAI\n🇮🇸 ISL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇰🇬
+  KGZ\n🇱🇦 Lao PDR\n🇱🇹 LTU\n🇲🇬 MAD\n🇲🇽 MEX\n🇫🇲 Micronesia\n🇲🇿
+  MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇶🇦 QAT\n🇹🇷 TUR\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -64,19 +46,12 @@ UID:20240727T094500Z-swimming-MENS-400M-FREESTYLE-HEATS
 DTSTAMP:20240727T094500Z
 DTSTART:20240727T094500Z
 DTEND:20240727T101400Z
-DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇺🇸 Aaron
-  SHACKELL\n🇹🇳 Ahmed JAOUADI\n🇨🇷 Alberto VEGA\n🇻🇪 Alfonso Enrique
-  MESTRE VIVAS\n🇨🇭 Antonio DJAKOVIC\n🇱🇹 Danas RAPSYS\n🇫🇷 David
-  AUBRY\n🇨🇱 Eduardo CISTERNAS\n🇧🇷 Eduardo OLIVEIRA de MORAES\n🇦🇺
-  Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇧🇷 Guilherme
-  COSTA\n🇲🇾 Hoe Yean KHIEW\n🇲🇦 Ilias EL FALLAKI\n🇺🇿 Ilya
-  SIBIRTSEV\n🇵🇪 Joaquin VARGAS\n🇧🇦 Jovan LEKIC\n🇰🇷 KIM Woomin\n🇬🇧
-  Kieran BIRD\n🇺🇸 Kieran SMITH\n🇪🇪 Kregor ZIRK\n🇸🇲 Loris
-  BIANCHI\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇮🇹 Marco de
-  TULLIO\n🇮🇹 Matteo LAMBERTI\n🇲🇰 Nikola GJURETANOVIKJ\n🇩🇪 Oliver
-  KLEMET\n🇲🇩 Pavel ALOVATKI\n🇧🇬 Petar Petrov MITSIN\n🇬🇾 Raekwon
-  Jibril NOEL\n🇰🇪 Ridhwan Abubakar Bwana MOHAMED\n🇦🇺 Samuel SHORT\n🇸🇪
-  Victor JOHANSSON\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 400m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇦 Bosnia & Herzegovina\n🇧🇷 BRA\n🇧🇬 BUL\n🇨🇱
+  CHI\n🇨🇳 CHN\n🇨🇷 CRC\n🇪🇪 EST\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇾
+  GUY\n🇭🇺 HUN\n🇮🇹 ITA\n🇰🇪 KEN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦
+  MAR\n🇲🇰 MKD\n🇵🇪 PER\n🇲🇩 Republic of Moldova\n🇸🇲 SMR\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇹🇳 TUN\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪 VEN
 SUMMARY:🏊 Men's 400m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -85,27 +60,10 @@ UID:20240727T101500Z-swimming-WOMENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T101500Z
 DTSTART:20240727T101500Z
 DTEND:20240727T102600Z
-DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇭🇰 AU
-  Hoi Shun Stephanie\n🇺🇸 Abbey WEITZEIL\n🇧🇷 Ana Carolina VIEIRA\n🇬🇧
-  Anna HOPKIN\n🇫🇷 Beryl GASTALDELLO\n🇦🇺 Bronte CAMPBELL\n🇨🇦 Brooklyn
-  DOUTHWRIGHT\n🇭🇰 CHENG Camille Lily Mei\n🇨🇳 CHENG Yujie\n🇫🇷
-  Charlotte BONNET\n🇮🇹 Chiara TARANTINO\n🇮🇪 Danielle HILL\n🇩🇰
-  Elisabeth Sabroe EBBESEN\n🇦🇺 Emma McKEON\n🇮🇹 Emma Virginia
-  MENICUCCI\n🇺🇸 Erika CONNOLLY\n🇮🇪 Erin RIORDAN\n🇬🇧 Eva OKARO\n🇬🇧
-  Freya ANDERSON\n🇧🇷 Giovana MEDEIROS\n🇮🇪 Grace DAVISON\n🇸🇮 Janja
-  SEGEL\n🇵🇱 Julia MAIK\n🇩🇰 Julie Kepp JENSEN\n🇭🇰 KAN Cheuk Tung
-  Natalie\n🇵🇱 Katarzyna WASICK\n🇺🇸 Kate DOUGLASS\n🇸🇮 Katja FAIN\n🇳🇱
-  Kim BUSCH\n🇵🇱 Kornelia FIEDKIEWICZ\n🇭🇺 Lilla Minna ABRAHAM\n🇫🇷
-  Lison NOWACZYK\n🇬🇧 Lucy HOPE\n🇧🇷 Maria Paula HEITMANN\n🇳🇱 Marrit
-  STEENBERGEN\n🇩🇰 Martine DAMBORG\n🇫🇷 Mary-Ambre MOLUH\n🇨🇦
-  Mary-Sophie HARVEY\n🇦🇺 Meg HARRIS\n🇸🇪 Michelle COLEMAN\n🇸🇮 Neza
-  KLANCAR\n🇭🇺 Nikolett PADAR\n🇦🇺 Olivia WUNSCH\n🇭🇺 Panna UGRAI\n🇨🇦
-  Penny OLEKSIAK\n🇭🇺 Petra SENANSZKY\n🇳🇱 Sam van NUNEN\n🇮🇹 Sara
-  CURTIS\n🇸🇪 Sara JUNEVIK\n🇸🇪 Sarah SJOESTROEM\n🇩🇰 Signe BRO\n🇺🇸
-  Simone MANUEL\n🇸🇪 Sofia AASTEDT\n🇮🇹 Sofia MORINI\n🇧🇷 Stephanie
-  BALDUCCINI\n🇭🇰 TAM Hoi Lam\n🇨🇦 Taylor RUCK\n🇳🇱 Tessa GIELE\n🇸🇮
-  Tjasa PINTAR\n🇮🇪 Victoria CATTERSON\n🇨🇳 WU Qingfeng\n🇨🇳 YANG
-  Junxuan\n🇨🇳 YU Yiting\n🇵🇱 Zuzanna FAMULOK
+DESCRIPTION:Swimming - Women's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇰 DEN\n🇫🇷 FRA\n🇬🇧 GBR\n🇭🇰
+  Hong Kong, China\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇳🇱 NED\n🇵🇱 POL\n🇸🇮
+  SLO\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -114,27 +72,10 @@ UID:20240727T102600Z-swimming-MENS-4-X-100M-FREESTYLE-RELAY-HEATS
 DTSTAMP:20240727T102600Z
 DTSTART:20240727T102600Z
 DTEND:20240727T103600Z
-DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇭🇺 Adam
-  JASZO\n🇬🇧 Alexander COHOON\n🇮🇱 Alexey GLIVINSKIY\n🇬🇷 Andreas
-  VAZAIOS\n🇷🇸 Andrej BARNA\n🇵🇱 Bartosz PISZCZOROWICZ\n🇸🇪 Bjoern
-  SEELIGER\n🇧🇷 Breno CORREIA\n🇨🇳 CHEN Juner\n🇺🇸 Caeleb DRESSEL\n🇪🇸
-  Cesar CASTRO VALLE\n🇮🇱 Denis LOKTEV\n🇵🇱 Dominik DUDYS\n🇬🇧 Duncan
-  SCOTT\n🇸🇪 Elias PERSSON\n🇨🇦 Finlay KNOX\n🇦🇺 Flynn SOUTHAM\n🇧🇷
-  Gabriel SANTOS\n🇮🇱 Gal COHEN GROUMI\n🇧🇷 Guilherme SANTOS\n🇫🇷
-  Guillaume GUTH\n🇫🇷 Hadrien SALVAN\n🇭🇺 Hubert KOS\n🇺🇸 Hunter
-  ARMSTRONG\n🇸🇪 Isak ELIASSON\n🇨🇳 JI Xinjie\n🇦🇺 Jack CARTWRIGHT\n🇬🇧
-  Jacob Henry WHITTLE\n🇨🇦 Javier ACEVEDO\n🇨🇦 Josh LIENDO\n🇩🇪 Josha
-  SALCHOW\n🇷🇸 Justin CVETKOV\n🇵🇱 Kamil SIERADZKI\n🇦🇺 Kyle
-  CHALMERS\n🇮🇹 Leonardo DEPLANO\n🇮🇹 Lorenzo ZAZZERI\n🇩🇪 Luca
-  ARMBRUSTER\n🇪🇸 Luis DOMINGUEZ\n🇮🇹 Manuel FRIGO\n🇧🇷 Marcelo
-  CHIERIGHINI\n🇪🇸 Mario MOLLA YANES\n🇵🇱 Mateusz CHOWANIEC\n🇺🇸 Matt
-  KING\n🇭🇺 Nandor NEMETH\n🇷🇸 Nikola ACIN\n🇬🇷 Odyssefs MELADINIS\n🇨🇳
-  PAN Zhanle\n🇬🇷 Panagiotis BOLANOS\n🇮🇹 Paolo CONTE BONIN\n🇩🇪 Peter
-  VARJASI\n🇫🇷 Rafael FENTE--DAMERS\n🇩🇪 Rafael MIROSLAW\n🇸🇪 Robin
-  HANSON\n🇺🇸 Ryan HELD\n🇪🇸 Sergio de CELIS MONTALBAN\n🇬🇷 Stergios
-  Marios BILAS\n🇭🇺 Szebasztian SZABO\n🇬🇧 Tom DEAN\n🇮🇱 Tomer
-  FRANKEL\n🇷🇸 Velimir STJEPANOVIC\n🇫🇷 W. Amazigh YEBBA\n🇨🇳 WANG
-  Haoyu\n🇦🇺 William YANG\n🇨🇦 Yuri KISIL
+DESCRIPTION:Swimming - Men's 4 x 100m Freestyle Relay - Heats\n🇦🇺
+  AUS\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇱 ISR\n🇮🇹 ITA\n🇵🇱 POL\n🇷🇸 SRB\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Men's 4 x 100m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -143,12 +84,9 @@ UID:20240727T183000Z-swimming-WOMENS-100M-BUTTERFLY-SEMIFINALS
 DTSTAMP:20240727T183000Z
 DTSTART:20240727T183000Z
 DTEND:20240727T184200Z
-DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 Alexandria
-  PERKINS\n🇩🇪 Angelina KOEHLER\n🇨🇿 Barbora SEEMANOVA\n🇦🇺 Emma
-  McKEON\n🇿🇦 Erin GALLAGHER\n🇺🇸 Gretchen WALSH\n🇯🇵 HIRAI Mizuki\n🇯🇵
-  IKEE Rikako\n🇬🇧 Keanna Louise MACINNES\n🇸🇪 Louise HANSSON\n🇨🇦
-  Margaret MAC NEIL\n🇫🇷 Marie WATTEL\n🇧🇪 Roos VANOTTERDIJK\n🇳🇱 Tessa
-  GIELE\n🇺🇸 Torri HUSKE\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 100m Butterfly Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇯🇵
+  JPN\n🇳🇱 NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Butterfly Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -181,11 +119,8 @@ UID:20240727T191200Z-swimming-MENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240727T191200Z
 DTSTART:20240727T191200Z
 DTEND:20240727T202600Z
-DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇬🇧 Adam
-  PEATY\n🇳🇱 Arno KAMMINGA\n🇦🇹 Bernhard REITSHAMMER\n🇳🇱 Caspar
-  CORBEAU\n🇺🇸 Charlie SWANSON\n🇬🇧 James WILBY\n🇦🇺 Joshua YONG\n🇩🇪
-  Lucas MATZERATH\n🇮🇹 Ludovico Blu Art VIBERTI\n🇩🇪 Melvin IMOUDU\n🇺🇸
-  Nic FINK\n🇮🇹 Nicolo MARTINENGHI\n🇨🇳 QIN Haiyang\n🇮🇱 Ron POLONSKY
+DESCRIPTION:Swimming - Men's 100m Breaststroke Semifinals\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇳🇱 NED\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -223,16 +158,10 @@ UID:20240728T090000Z-swimming-MENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T090000Z
 DTSTART:20240728T090000Z
 DTEND:20240728T091400Z
-DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇮🇹 Alessandro
-  RAGAINI\n🇨🇭 Antonio DJAKOVIC\n🇺🇸 Chris GUILIANO\n🇱🇹 Danas
-  RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧 Duncan SCOTT\n🇦🇹
-  Felix AUBOECK\n🇮🇹 Filippo MEGLI\n🇧🇷 Guilherme COSTA\n🇰🇷 HWANG
-  Sunwoo\n🇨🇳 JI Xinjie\n🇲🇽 Jorge IGA\n🇰🇷 KIM Woomin\n🇧🇪 Lucas
-  HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵 MATSUMOTO
-  Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian GIULIANI\n🇵🇰
-  Muhammad Ahmed DURRANI\n🇭🇺 Nandor NEMETH\n🇸🇾 Omar ABBAS\n🇨🇳 PAN
-  Zhanle\n🇩🇪 Rafael MIROSLAW\n🇸🇮 Saso BOSKAN\n🇦🇺 Thomas NEILL\n🇷🇸
-  Velimir STJEPANOVIC
+DESCRIPTION:Swimming - Men's 200m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇩🇪 GER\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹 LTU\n🇲🇽 MEX\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇷🇸 SRB\n🇸🇮 SLO\n🇨🇭 SUI\n🇸🇾 SYR\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -241,12 +170,9 @@ UID:20240728T091500Z-swimming-MENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240728T091500Z
 DTSTART:20240728T091500Z
 DTEND:20240728T092700Z
-DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇮🇹 Alberto
-  RAZZETTI\n🇬🇷 Apostolos PAPASTAMOS\n🇭🇺 Balazs HOLLO\n🇦🇺 Brendon
-  SMITH\n🇺🇸 Carson FOSTER\n🇩🇪 Cedric BUESSING\n🇺🇸 Chase KALISZ\n🇭🇺
-  Gabor ZOMBORI\n🇫🇷 Leon MARCHAND\n🇳🇿 Lewis CLAREBURT\n🇯🇵 MATSUSHITA
-  Tomoyuki\n🇬🇧 Max LITCHFIELD\n🇯🇵 SETO Daiya\n🇨🇦 Tristan
-  JANKOVICS\n🇦🇺 William Campbell PETRIC\n🇨🇳 ZHANG Zhanshuo
+DESCRIPTION:Swimming - Men's 400m Individual Medley - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇳🇿 NZL\n🇺🇸 USA
 SUMMARY:🏊 Men's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -255,18 +181,12 @@ UID:20240728T092700Z-swimming-WOMENS-100M-BREASTSTROKE-HEATS
 DTSTAMP:20240728T092700Z
 DTSTART:20240728T092700Z
 DTEND:20240728T094200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇯🇵 AOKI
-  Reona\n🇬🇲 Aminata Nia-Maria BARROW\n🇮🇱 Anastasia GORBENKO\n🇬🇧
-  Angharad EVANS\n🇩🇪 Anna ELENDT\n🇮🇹 Benedetta PILATO\n🇵🇱 Dominika
-  SZTANDERA\n🇦🇬 Ellie SHAW\n🇵🇦 Emily SANTOS SILVA\n🇺🇸 Emma
-  WEBER\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇫🇮 Ida HULKKO\n🇲🇦
-  Imane Houda EL BARODI\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL
-  MONTERO\n🇱🇹 Kotryna TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇨🇰 Lanihei
-  CONNOLLY\n🇰🇼 Lara DASHTI\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇨🇭
-  Lisa MAMIE\n🇱🇧 Lynn EL HAJJ\n🇦🇷 Macarena CEBALLOS\n🇮🇪 Mona Mc
-  SHARRY\n🇲🇾 Rouxin TAN\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI Satomi\n🇨🇦
-  Sophie ANGUS\n🇸🇪 Sophie HANSSON\n🇨🇴 Stefania GOMEZ HURTADO\n🇨🇳 TANG
-  Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke - Heats\n🇦🇬 ANT\n🇦🇷
+  ARG\n🇦🇺 AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇴 COL\n🇨🇰 COK\n🇨🇿 CZE\n🇪🇪
+  EST\n🇫🇮 FIN\n🇬🇲 GAM\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇰🇼 KUW\n🇱🇧 LBN\n🇱🇹 LTU\n🇲🇾 MAS\n🇲🇦 MAR\n🇳🇱
+  NED\n🇵🇦 PAN\n🇵🇱 POL\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪 SWE\n🇨🇭
+  SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -275,22 +195,13 @@ UID:20240728T094300Z-swimming-MENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240728T094300Z
 DTSTART:20240728T094300Z
 DTEND:20240728T095900Z
-DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇭🇺 Adam JASZO\n🇮🇱
-  Adam MARAANA\n🇹🇴 Alan Koti Lopeti UHI\n🇧🇯 Alexis Michel Roger Dodji
-  KPADE\n🇨🇴 Anthony RINCON VELASCO\n🇬🇷 Apostolos CHRISTOU\n🇹🇷 Berke
-  SAKA\n🇦🇹 Bernhard REITSHAMMER\n🇨🇦 Blake TIERNEY\n🇦🇺 Bradley
-  WOODWARD\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo
-  GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇦🇺 Isaac COOPER\n🇧🇲 Jack
-  HARVEY\n🇨🇦 Javier ACEVEDO\n🇵🇹 Joao COSTA\n🇬🇧 Jonny MARSHALL\n🇳🇱
-  Kai van WESTERING\n🇳🇿 Kane FOLLOWS\n🇵🇱 Ksawery MASIUK\n🇰🇷 LEE
-  Juho\n🇯🇵 MATSUYAMA Riku\n🇩🇪 Marek ULRICH\n🇻🇮 Maximillian
-  WILSON\n🇫🇷 Mewen TOMAC\n🇮🇹 Michele LAMBERTI\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇪 Noe PANSTKHAVA\n🇩🇪 Ole BRAUNSCHWEIG\n🇺🇦 Oleksandr
-  ZHELTIAKOV\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman
-  MITYUKOV\n🇺🇸 Ryan MURPHY\n🇮🇳 Srihari NATARAJ\n🇨🇭 Thierry
-  BOLLIN\n🇮🇹 Thomas CECCON\n🇦🇷 Ulises SARAVIA\n🇨🇳 XU Jiayu\n🇵🇸
-  Yazan AL BAWWAB\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇬🇩
-  Zackary GRESHAM\n🇧🇳 Zeke CHAN
+DESCRIPTION:Swimming - Men's 100m Backstroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇦🇹 AUT\n🇧🇯 BEN\n🇧🇲 BER\n🇧🇳 Brunei Darussalam\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇴 COL\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇪 GEO\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷
+  GRE\n🇬🇩 GRN\n🇭🇺 HUN\n🇮🇳 IND\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷
+  KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇸 PLE\n🇵🇱 POL\n🇵🇹 POR\n🇵🇷 PUR\n🇿🇦
+  RSA\n🇪🇸 ESP\n🇨🇭 SUI\n🇹🇴 TGA\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇻🇮
+  Virgin Islands, US
 SUMMARY:🏊 Men's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -299,18 +210,11 @@ UID:20240728T100000Z-swimming-WOMENS-200M-FREESTYLE-HEATS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
 DTEND:20240728T101600Z
-DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇿🇦 Aimee
-  CANNY\n🇨🇺 Andrea BECALI\n🇱🇦 Ariana Southa DIRKZWAGER\n🇦🇺 Ariarne
-  TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire WEINSTEIN\n🇮🇳 Dhinidhi
-  DESINGHU\n🇳🇵 Duana LAMA\n🇲🇳 Enkhkhuslen BATBAYAR\n🇳🇿 Erika
-  FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY Siobhan Bernadette\n🇵🇰
-  Jehanara NABI\n🇩🇪 Julia MROZINSKI\n🇭🇳 Julimar AVILA MANCIA\n🇦🇱
-  Kaltra MECA\n🇨🇳 LI Bingjie\n🇮🇱 Lea POLONSKY\n🇭🇺 Lilla Minna
-  ABRAHAM\n🇪🇬 Lojine ABDALLA SALAH\n🇦🇪 Maha ALSHEHHI\n🇧🇷 Maria
-  Fernanda COSTA\n🇻🇪 Maria Victoria YEGRES COTTIN\n🇨🇦 Mary-Sophie
-  HARVEY\n🇸🇦 Mashael Meshari A ALAYED\n🇦🇺 Mollie O'CALLAGHAN\n🇭🇺
-  Nikolett PADAR\n🇷🇴 Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol
-  JORUNNARDOTTIR\n🇧🇪 Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle - Heats\n🇦🇱 ALB\n🇦🇺
+  AUS\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇺 CUB\n🇨🇿 CZE\n🇪🇬
+  EGY\n🇩🇪 GER\n🇭🇳 HON\n🇭🇰 Hong Kong, China\n🇭🇺 HUN\n🇮🇸 ISL\n🇮🇳
+  IND\n🇮🇱 ISR\n🇱🇦 Lao PDR\n🇲🇳 MGL\n🇳🇵 NEP\n🇳🇿 NZL\n🇵🇰 PAK\n🇷🇴
+  ROU\n🇸🇦 KSA\n🇿🇦 RSA\n🇦🇪 UA Emirates\n🇺🇸 USA\n🇻🇪 VEN
 SUMMARY:🏊 Women's 200m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -343,12 +247,9 @@ UID:20240728T184600Z-swimming-MENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T184600Z
 DTSTART:20240728T184600Z
 DTEND:20240728T190000Z
-DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇮🇹 Alessandro
-  RAGAINI\n🇱🇹 Danas RAPSYS\n🇷🇴 David POPOVICI\n🇮🇱 Denis LOKTEV\n🇬🇧
-  Duncan SCOTT\n🇮🇹 Filippo MEGLI\n🇰🇷 HWANG Sunwoo\n🇰🇷 KIM
-  Woomin\n🇧🇪 Lucas HENVEAUX\n🇩🇪 Lukas MAERTENS\n🇺🇸 Luke HOBSON\n🇯🇵
-  MATSUMOTO Katsuhiro\n🇬🇧 Matthew RICHARDS\n🇦🇺 Maximillian
-  GIULIANI\n🇩🇪 Rafael MIROSLAW\n🇦🇺 Thomas NEILL
+DESCRIPTION:Swimming - Men's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇩🇪 GER\n🇬🇧 GBR\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇱🇹
+  LTU\n🇷🇴 ROU\n🇺🇸 USA
 SUMMARY:🏊 Men's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -357,12 +258,9 @@ UID:20240728T191000Z-swimming-WOMENS-100M-BREASTSTROKE-SEMIFINALS
 DTSTAMP:20240728T191000Z
 DTSTART:20240728T191000Z
 DTEND:20240728T192200Z
-DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇬🇧 Angharad
-  EVANS\n🇮🇹 Benedetta PILATO\n🇪🇪 Eneli JEFIMOVA\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇺🇸 Lilly KING\n🇮🇹 Lisa ANGIOLINI\n🇦🇷 Macarena
-  CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇱🇹 Ruta MEILUTYTE\n🇯🇵 SUZUKI
-  Satomi\n🇸🇪 Sophie HANSSON\n🇨🇳 TANG Qianting\n🇿🇦 Tatjana SMITH\n🇳🇱
-  Tes SCHOUTEN\n🇨🇳 YANG Chang
+DESCRIPTION:Swimming - Women's 100m Breaststroke Semifinals\n🇦🇷 ARG\n🇨🇳
+  CHN\n🇪🇪 EST\n🇬🇧 GBR\n🇮🇪 IRL\n🇮🇹 ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱
+  NED\n🇿🇦 RSA\n🇸🇪 SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Breaststroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -371,12 +269,9 @@ UID:20240728T193200Z-swimming-MENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240728T193200Z
 DTSTART:20240728T193200Z
 DTEND:20240728T194400Z
-DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇬🇷 Apostolos
-  CHRISTOU\n🇨🇦 Blake TIERNEY\n🇬🇷 Evangelos MAKRYGIANNIS\n🇭🇺 Hubert
-  KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇺🇸 Hunter ARMSTRONG\n🇬🇧 Jonny
-  MARSHALL\n🇵🇱 Ksawery MASIUK\n🇫🇷 Mewen TOMAC\n🇨🇿 Miroslav
-  KNEDLA\n🇬🇧 Oliver MORGAN\n🇿🇦 Pieter COETZE\n🇺🇸 Ryan MURPHY\n🇮🇹
-  Thomas CECCON\n🇨🇳 XU Jiayu\n🇫🇷 Yohann NDOYE-BROUARD
+DESCRIPTION:Swimming - Men's 100m Backstroke Semifinals\n🇨🇦 CAN\n🇨🇳
+  CHN\n🇨🇿 CZE\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇹 ITA\n🇵🇱
+  POL\n🇿🇦 RSA\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Men's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -396,13 +291,9 @@ UID:20240728T195000Z-swimming-WOMENS-200M-FREESTYLE-SEMIFINALS
 DTSTAMP:20240728T195000Z
 DTSTART:20240728T195000Z
 DTEND:20240728T200400Z
-DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇿🇦 Aimee
-  CANNY\n🇦🇺 Ariarne TITMUS\n🇨🇿 Barbora SEEMANOVA\n🇺🇸 Claire
-  WEINSTEIN\n🇳🇿 Erika FAIRWEATHER\n🇺🇸 Erin GEMMELL\n🇭🇰 HAUGHEY
-  Siobhan Bernadette\n🇨🇳 LI Bingjie\n🇭🇺 Lilla Minna ABRAHAM\n🇧🇷 Maria
-  Fernanda COSTA\n🇨🇦 Mary-Sophie HARVEY\n🇦🇺 Mollie O'CALLAGHAN\n🇷🇴
-  Rebecca-Aimee DIACONESCU\n🇮🇸 Snaefridur Sol JORUNNARDOTTIR\n🇧🇪
-  Valentine DUMONT\n🇨🇳 YANG Junxuan
+DESCRIPTION:Swimming - Women's 200m Freestyle Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇧🇷 BRA\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇭🇰 Hong Kong, China\n🇭🇺
+  HUN\n🇮🇸 ISL\n🇳🇿 NZL\n🇷🇴 ROU\n🇿🇦 RSA\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Freestyle Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -411,12 +302,9 @@ UID:20240729T090000Z-swimming-WOMENS-400M-INDIVIDUAL-MEDLEY-HEATS
 DTSTAMP:20240729T090000Z
 DTSTART:20240729T090000Z
 DTEND:20240729T091200Z
-DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇮🇱
-  Anastasia GORBENKO\n🇷🇸 Anja CREVAR\n🇨🇦 Ella JANSEN\n🇦🇺 Ella
-  RAMSAY\n🇮🇪 Ellen WALSHE\n🇪🇸 Emma CARRASCO CADENS\n🇺🇸 Emma
-  WEYANT\n🇬🇧 Freya Constance COLBERT\n🇦🇺 Jenna FORRESTER\n🇺🇸 Katie
-  GRIMES\n🇬🇧 Katie SHANAHAN\n🇯🇵 NARITA Mio\n🇮🇹 Sara FRANCESCHI\n🇨🇦
-  Summer McINTOSH\n🇯🇵 TANIGAWA Ageha\n🇭🇺 Vivien JACKL
+DESCRIPTION:Swimming - Women's 400m Individual Medley - Heats\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇬🇧 GBR\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇱 ISR\n🇮🇹 ITA\n🇯🇵
+  JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 400m Individual Medley - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -425,18 +313,11 @@ UID:20240729T091300Z-swimming-WOMENS-100M-BACKSTROKE-HEATS
 DTSTAMP:20240729T091300Z
 DTSTART:20240729T091300Z
 DTEND:20240729T092700Z
-DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇵🇱 Adela
-  PISKORSKA\n🇧🇭 Amani ALOBAIDLI\n🇮🇱 Aviv BARZELAY\n🇹🇲 Aynura
-  PRIMOVA\n🇫🇷 Beryl GASTALDELLO\n🇭🇰 CHEUNG Sum Yuet Cindy\n🇪🇸 Carmen
-  WEILER SASTRE\n🇲🇽 Celia PULIDO ORTIZ\n🇸🇻 Celina MARQUEZ\n🇮🇪
-  Danielle HILL\n🇲🇿 Denise DONELLI\n🇩🇴 Elizabeth JIMENEZ\n🇧🇲 Emma
-  HARVEY\n🇫🇷 Emma TEREBO\n🇧🇬 Gabriela GEORGIEVA\n🇱🇰 Ganga
-  SENAVIRATHNE\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇬🇧 Kathleen DAWSON\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira
-  TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪 Louise HANSSON\n🇬🇹 Lucero MEJIA\n🇳🇱
-  Maaike de WAARD\n🇬🇧 Medi Eira HARRIS\n🇱🇾 Mek ALMUKHTAR\n🇺🇦 Nika
-  SHARAFUTDINOVA\n🇺🇸 Regan SMITH\n🇧🇪 Roos VANOTTERDIJK\n🇨🇳 WAN
-  Letian\n🇨🇳 WANG Xueer\n🇰🇿 Xeniya IGNATOVA\n🇹🇹 Zuri FERGUSON
+DESCRIPTION:Swimming - Women's 100m Backstroke - Heats\n🇦🇺 AUS\n🇧🇭
+  BRN\n🇧🇪 BEL\n🇧🇲 BER\n🇧🇬 BUL\n🇨🇦 CAN\n🇨🇳 CHN\n🇩🇴 DOM\n🇸🇻
+  ESA\n🇫🇷 FRA\n🇬🇧 GBR\n🇬🇹 GUA\n🇭🇰 Hong Kong, China\n🇮🇪 IRL\n🇮🇱
+  ISR\n🇰🇿 KAZ\n🇱🇾 LBA\n🇲🇽 MEX\n🇲🇿 MOZ\n🇳🇱 NED\n🇵🇱 POL\n🇪🇸
+  ESP\n🇱🇰 SRI\n🇸🇪 SWE\n🇹🇹 TTO\n🇹🇲 TKM\n🇺🇦 UKR\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -445,17 +326,11 @@ UID:20240729T092800Z-swimming-MENS-800M-FREESTYLE-HEATS
 DTSTAMP:20240729T092800Z
 DTSTART:20240729T092800Z
 DTEND:20240729T100700Z
-DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇹🇳 Ahmed
-  JAOUADI\n🇻🇪 Alfonso Enrique MESTRE VIVAS\n🇺🇸 Bobby FINKE\n🇪🇸 Carlos
-  GARACH BENITO\n🇮🇪 Daniel WIFFEN\n🇫🇷 David AUBRY\n🇬🇷 Dimitrios
-  MARKOS\n🇦🇺 Elijah WINNINGTON\n🇨🇳 FEI Liwei\n🇦🇹 Felix AUBOECK\n🇩🇪
-  Florian WELLBROCK\n🇮🇹 Gregorio PALTRINIERI\n🇧🇷 Guilherme COSTA\n🇳🇴
-  Henrik CHRISTIANSEN\n🇻🇳 Huy Hoang NGUYEN\n🇺🇿 Ilya SIBIRTSEV\n🇳🇴 Jon
-  JOENTVEDT\n🇹🇷 Kuzey TUNCELLI\n🇮🇹 Luca de TULLIO\n🇧🇪 Lucas
-  HENVEAUX\n🇺🇸 Luke WHITLOCK\n🇪🇬 Marwan ELKAMASH\n🇺🇦 Mykhailo
-  ROMANCHUK\n🇫🇷 Pacome BRICOUT\n🇦🇺 Samuel SHORT\n🇩🇪 Sven
-  SCHWARZ\n🇲🇨 Theo DRUENNE\n🇸🇪 Victor JOHANSSON\n🇷🇴 Vlad Stefan
-  STANCU\n🇨🇳 ZHANG Zhanshuo\n🇭🇺 Zalan SARKANY
+DESCRIPTION:Swimming - Men's 800m Freestyle - Heats\n🇦🇺 AUS\n🇦🇹
+  AUT\n🇧🇪 BEL\n🇧🇷 BRA\n🇨🇳 CHN\n🇪🇬 EGY\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇷
+  GRE\n🇭🇺 HUN\n🇮🇪 IRL\n🇮🇹 ITA\n🇲🇨 MON\n🇳🇴 NOR\n🇷🇴 ROU\n🇪🇸
+  ESP\n🇸🇪 SWE\n🇹🇳 TUN\n🇹🇷 TUR\n🇺🇦 UKR\n🇺🇸 USA\n🇺🇿 UZB\n🇻🇪
+  VEN\n🇻🇳 VIE
 SUMMARY:🏊 Men's 800m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -488,12 +363,9 @@ UID:20240729T190100Z-swimming-WOMENS-100M-BACKSTROKE-SEMIFINALS
 DTSTAMP:20240729T190100Z
 DTSTART:20240729T190100Z
 DTEND:20240729T191500Z
-DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇫🇷 Beryl
-  GASTALDELLO\n🇪🇸 Carmen WEILER SASTRE\n🇮🇪 Danielle HILL\n🇫🇷 Emma
-  TEREBO\n🇨🇦 Ingrid WILM\n🇦🇺 Iona ANDERSON\n🇺🇸 Katharine
-  BERKOFF\n🇦🇺 Kaylee McKEOWN\n🇳🇱 Kira TOUSSAINT\n🇨🇦 Kylie MASSE\n🇸🇪
-  Louise HANSSON\n🇳🇱 Maaike de WAARD\n🇺🇸 Regan SMITH\n🇧🇪 Roos
-  VANOTTERDIJK\n🇨🇳 WAN Letian\n🇨🇳 WANG Xueer
+DESCRIPTION:Swimming - Women's 100m Backstroke Semifinals\n🇦🇺 AUS\n🇧🇪
+  BEL\n🇨🇦 CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇮🇪 IRL\n🇳🇱 NED\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇺🇸 USA
 SUMMARY:🏊 Women's 100m Backstroke Semifinals
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -759,14 +631,10 @@ UID:20240731T090000Z-swimming-WOMENS-200M-BREASTSTROKE-HEATS
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T092100Z
-DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇺 Ella
-  RAMSAY\n🇸🇬 En Yi Letitia SIM\n🇪🇪 Eneli JEFIMOVA\n🇮🇹 Francesca
-  FANGIO\n🇦🇺 Jenna STRAUCH\n🇪🇸 Jessica VALL MONTERO\n🇺🇸 Kate
-  DOUGLASS\n🇿🇦 Kaylene CORBETT\n🇨🇦 Kelsey WOG\n🇱🇹 Kotryna
-  TETEREVKOVA\n🇨🇿 Kristyna HORSKA\n🇺🇸 Lilly KING\n🇨🇭 Lisa MAMIE\n🇦🇷
-  Macarena CEBALLOS\n🇮🇪 Mona Mc SHARRY\n🇯🇵 SUZUKI Satomi\n🇸🇪 Sophie
-  HANSSON\n🇨🇦 Sydney PICKREM\n🇿🇦 Tatjana SMITH\n🇳🇱 Tes SCHOUTEN\n🇩🇰
-  Thea BLOMSTERBERG\n🇨🇳 YE Shiwen
+DESCRIPTION:Swimming - Women's 200m Breaststroke - Heats\n🇦🇷 ARG\n🇦🇺
+  AUS\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇿 CZE\n🇩🇰 DEN\n🇪🇪 EST\n🇮🇪 IRL\n🇮🇹
+  ITA\n🇯🇵 JPN\n🇱🇹 LTU\n🇳🇱 NED\n🇸🇬 SGP\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇪
+  SWE\n🇨🇭 SUI\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -775,16 +643,10 @@ UID:20240731T092100Z-swimming-MENS-200M-BACKSTROKE-HEATS
 DTSTAMP:20240731T092100Z
 DTSTART:20240731T092100Z
 DTEND:20240731T094600Z
-DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇭🇺 Adam
-  TELEGDY\n🇬🇷 Apostolos CHRISTOU\n🇬🇷 Apostolos SISKOS\n🇨🇦 Blake
-  TIERNEY\n🇦🇺 Bradley WOODWARD\n🇮🇱 David GERCHIK\n🇿🇼 Denilson
-  CYPRIANOS\n🇭🇺 Hubert KOS\n🇪🇸 Hugo GONZALEZ de OLIVEIRA\n🇳🇱 Kai van
-  WESTERING\n🇳🇿 Kane FOLLOWS\n🇺🇸 Keaton JONES\n🇵🇱 Ksawery
-  MASIUK\n🇰🇷 LEE Juho\n🇩🇪 Lukas MAERTENS\n🇬🇧 Luke GREENBANK\n🇮🇹
-  Matteo RESTIVO\n🇫🇷 Mewen TOMAC\n🇺🇦 Oleksandr ZHELTIAKOV\n🇬🇧 Oliver
-  MORGAN\n🇿🇦 Pieter COETZE\n🇨🇭 Roman MITYUKOV\n🇺🇸 Ryan MURPHY\n🇦🇺
-  Se-Bom LEE\n🇯🇵 TAKEHARA Hidekazu\n🇮🇹 Thomas CECCON\n🇨🇳 XU
-  Jiayu\n🇵🇷 Yeziel MORALES\n🇫🇷 Yohann NDOYE-BROUARD\n🇸🇩 Ziyad SALEEM
+DESCRIPTION:Swimming - Men's 200m Backstroke - Heats\n🇦🇺 AUS\n🇨🇦
+  CAN\n🇨🇳 CHN\n🇫🇷 FRA\n🇩🇪 GER\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇮🇱
+  ISR\n🇮🇹 ITA\n🇯🇵 JPN\n🇰🇷 KOR\n🇳🇱 NED\n🇳🇿 NZL\n🇵🇱 POL\n🇵🇷
+  PUR\n🇿🇦 RSA\n🇪🇸 ESP\n🇸🇩 SUD\n🇨🇭 SUI\n🇺🇦 UKR\n🇺🇸 USA\n🇿🇼 ZIM
 SUMMARY:🏊 Men's 200m Backstroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
@@ -793,13 +655,9 @@ UID:20240731T094600Z-swimming-WOMENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240731T094600Z
 DTSTART:20240731T094600Z
 DTEND:20240731T100600Z
-DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇺 Abbey Lee
-  CONNOR\n🇺🇸 Alex SHACKELL\n🇨🇷 Alondra ORTIZ\n🇷🇸 Anja CREVAR\n🇭🇺
-  Boglarka KAPAS\n🇨🇳 CHEN Luying\n🇦🇺 Elizabeth DEKKERS\n🇬🇷 Georgia
-  DAMASIOTI\n🇩🇰 Helena Rosendahl BACH\n🇬🇧 Keanna Louise MACINNES\n🇧🇦
-  Lana PUDAR\n🇪🇸 Laura CABANES GARZAS\n🇬🇧 Laura STEPHENS\n🇦🇴 Lia
-  LIMA\n🇯🇵 MAKINO Hiroko\n🇯🇵 MITSUI Airi\n🇺🇸 Regan SMITH\n🇨🇦 Summer
-  McINTOSH\n🇨🇳 ZHANG Yufei
+DESCRIPTION:Swimming - Women's 200m Butterfly - Heats\n🇦🇴 ANG\n🇦🇺
+  AUS\n🇧🇦 Bosnia & Herzegovina\n🇨🇦 CAN\n🇨🇳 CHN\n🇨🇷 CRC\n🇩🇰
+  DEN\n🇬🇧 GBR\n🇬🇷 GRE\n🇭🇺 HUN\n🇯🇵 JPN\n🇷🇸 SRB\n🇪🇸 ESP\n🇺🇸 USA
 SUMMARY:🏊 Women's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
diff --git a/docs/today.html b/docs/today.html
index f82563a17..61d0a97d9 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -1676,7 +1676,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240727T090000Z" data-end="20240727T091100Z" data-noc="IRL,SWZ,PAR,GEO,SWE,JPN,DEN,CZE,GBR,GER,FRA,BEL,ARM,ITA,ITA,USA,USA,BIH,NZL,CHN,AUS,AUS,NCA,GRE,GRE,ESP,RSA,SEN,JPN,CAN,CAN,NED">
+<div class="event py-4" data-start="20240727T090000Z" data-end="20240727T091100Z" data-noc="ARM,AUS,BEL,BIH,CAN,CHN,CZE,DEN,ESP,FRA,GBR,GEO,GER,GRE,IRL,ITA,JPN,NCA,NED,NZL,PAR,RSA,SEN,SWE,SWZ,USA">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -1685,38 +1685,7 @@
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
    <div class="">Women's 100m Butterfly - Heats
-<div class= "competitor AUS"> 🇦🇺 Alexandria PERKINS </div>
-<div class= "competitor GEO"> 🇬🇪 Ana NIZHARADZE </div>
-<div class= "competitor GER"> 🇩🇪 Angelina KOEHLER </div>
-<div class= "competitor GRE"> 🇬🇷 Anna NTOUNTOUNAKI </div>
-<div class= "competitor CZE"> 🇨🇿 Barbora SEEMANOVA </div>
-<div class= "competitor ITA"> 🇮🇹 Costanza COCCONCELLI </div>
-<div class= "competitor IRL"> 🇮🇪 Ellen WALSHE </div>
-<div class= "competitor AUS"> 🇦🇺 Emma McKEON </div>
-<div class= "competitor RSA"> 🇿🇦 Erin GALLAGHER </div>
-<div class= "competitor GRE"> 🇬🇷 Georgia DAMASIOTI </div>
-<div class= "competitor USA"> 🇺🇸 Gretchen WALSH </div>
-<div class= "competitor JPN"> 🇯🇵 HIRAI Mizuki </div>
-<div class= "competitor SWZ"> 🇸🇿 Hayley HOY </div>
-<div class= "competitor DEN"> 🇩🇰 Helena Rosendahl BACH </div>
-<div class= "competitor JPN"> 🇯🇵 IKEE Rikako </div>
-<div class= "competitor GBR"> 🇬🇧 Keanna Louise MACINNES </div>
-<div class= "competitor BIH"> 🇧🇦 Lana PUDAR </div>
-<div class= "competitor ESP"> 🇪🇸 Laura CABANES GARZAS </div>
-<div class= "competitor SWE"> 🇸🇪 Louise HANSSON </div>
-<div class= "competitor PAR"> 🇵🇾 Luana ALONSO </div>
-<div class= "competitor CAN"> 🇨🇦 Margaret MAC NEIL </div>
-<div class= "competitor NCA"> 🇳🇮 Maria Victoria SCHUTZMEIER </div>
-<div class= "competitor FRA"> 🇫🇷 Marie WATTEL </div>
-<div class= "competitor SEN"> 🇸🇳 Oumy DIOP </div>
-<div class= "competitor CAN"> 🇨🇦 Rebecca SMITH </div>
-<div class= "competitor BEL"> 🇧🇪 Roos VANOTTERDIJK </div>
-<div class= "competitor NED"> 🇳🇱 Tessa GIELE </div>
-<div class= "competitor USA"> 🇺🇸 Torri HUSKE </div>
-<div class= "competitor NZL"> 🇳🇿 Vanessa Hazel OUWEHAND </div>
-<div class= "competitor ARM"> 🇦🇲 Varsenik MANUCHARYAN </div>
-<div class= "competitor ITA"> 🇮🇹 Viola SCOTTO di CARLO </div>
-<div class= "competitor CHN"> 🇨🇳 ZHANG Yufei </div>
+<div class= "competitor BIH"> 🇧🇦 Bosnia & Herzegovina </div>
    </div>
  </div>
 </div>
@@ -1772,7 +1741,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240727T091200Z" data-end="20240727T093000Z" data-noc="ARG,ISV,JOR,JPN,BEL,HUN,GER,GER,FRA,USA,USA,NZL,NZL,CHN,CHN,AUS,AUS,BRA,BRA,CAN,UZB">
+<div class="event py-4" data-start="20240727T091200Z" data-end="20240727T093000Z" data-noc="ARG,AUS,BEL,BRA,CAN,CHN,FRA,GER,HUN,ISV,JOR,JPN,NZL,USA,UZB">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -1781,27 +1750,7 @@
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
    <div class="">Women's 400m Freestyle - Heats
-<div class= "competitor ARG"> 🇦🇷 Agostina HEIN </div>
-<div class= "competitor HUN"> 🇭🇺 Ajna KESELY </div>
-<div class= "competitor FRA"> 🇫🇷 Anastasiia KIRPICHNIKOVA </div>
-<div class= "competitor UZB"> 🇺🇿 Anastasiya ZELINSKAYA </div>
-<div class= "competitor AUS"> 🇦🇺 Ariarne TITMUS </div>
-<div class= "competitor NZL"> 🇳🇿 Erika FAIRWEATHER </div>
-<div class= "competitor NZL"> 🇳🇿 Eve THOMAS </div>
-<div class= "competitor BRA"> 🇧🇷 Gabrielle RONCATTO </div>
-<div class= "competitor GER"> 🇩🇪 Isabel GOSE </div>
-<div class= "competitor AUS"> 🇦🇺 Jamie PERKINS </div>
-<div class= "competitor JPN"> 🇯🇵 KOBORI Waka </div>
-<div class= "competitor JOR"> 🇯🇴 Karin BELBEISI </div>
-<div class= "competitor USA"> 🇺🇸 Katie LEDECKY </div>
-<div class= "competitor CHN"> 🇨🇳 LI Bingjie </div>
-<div class= "competitor CHN"> 🇨🇳 LIU Yaxin </div>
-<div class= "competitor GER"> 🇩🇪 Leonie MAERTENS </div>
-<div class= "competitor BRA"> 🇧🇷 Maria Fernanda COSTA </div>
-<div class= "competitor ISV"> 🇻🇮 Natalia Jean KUIPERS </div>
-<div class= "competitor USA"> 🇺🇸 Paige MADDEN </div>
-<div class= "competitor CAN"> 🇨🇦 Summer McINTOSH </div>
-<div class= "competitor BEL"> 🇧🇪 Valentine DUMONT </div>
+<div class= "competitor ISV"> 🇻🇮 Virgin Islands, US </div>
    </div>
  </div>
 </div>
@@ -1947,7 +1896,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240727T093000Z" data-end="20240727T094400Z" data-noc="MEX,FSM,MOZ,ANT,AUT,KGZ,POL,TUR,QAT,ISR,KOR,GBR,GER,GER,MAD,ITA,ITA,ISL,HAI,USA,USA,CHN,CHN,AUS,AUS,LTU,ASA,GBR,JPN,NED,NED,BOT,SWZ,LAO">
+<div class="event py-4" data-start="20240727T093000Z" data-end="20240727T094400Z" data-noc="ANT,ASA,AUS,AUT,BOT,CHN,FSM,GBR,GER,HAI,ISL,ISR,ITA,JPN,KGZ,KOR,LAO,LTU,MAD,MEX,MOZ,NED,POL,QAT,SWZ,TUR,USA">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -1956,40 +1905,8 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div class="">Men's 100m Breaststroke - Heats
-<div class= "competitor QAT"> 🇶🇦 Abdulaziz AL-OBAIDLY </div>
-<div class= "competitor GBR"> 🇬🇧 Adam PEATY </div>
-<div class= "competitor BOT"> 🇧🇼 Adrian ROBINSON </div>
-<div class= "competitor HAI"> 🇭🇹 Alexandre GRAND'PIERRE </div>
-<div class= "competitor LTU"> 🇱🇹 Andrius SIDLAUSKAS </div>
-<div class= "competitor ISL"> 🇮🇸 Anton McKEE </div>
-<div class= "competitor NED"> 🇳🇱 Arno KAMMINGA </div>
-<div class= "competitor TUR"> 🇹🇷 Berkay OGRETIR </div>
-<div class= "competitor AUT"> 🇦🇹 Bernhard REITSHAMMER </div>
-<div class= "competitor KOR"> 🇰🇷 CHOI Dongyeol </div>
-<div class= "competitor NED"> 🇳🇱 Caspar CORBEAU </div>
-<div class= "competitor SWZ"> 🇸🇿 Chadd NG CHIU HING NING </div>
-<div class= "competitor USA"> 🇺🇸 Charlie SWANSON </div>
-<div class= "competitor KGZ"> 🇰🇬 Denis PETRASHOV </div>
-<div class= "competitor ANT"> 🇦🇬 Jadon WUILLIEZ </div>
-<div class= "competitor GBR"> 🇬🇧 James WILBY </div>
-<div class= "competitor POL"> 🇵🇱 Jan KALUSOWSKI </div>
-<div class= "competitor MAD"> 🇲🇬 Jonathan RAHARVEL </div>
-<div class= "competitor AUS"> 🇦🇺 Joshua YONG </div>
-<div class= "competitor GER"> 🇩🇪 Lucas MATZERATH </div>
-<div class= "competitor ITA"> 🇮🇹 Ludovico Blu Art VIBERTI </div>
-<div class= "competitor MOZ"> 🇲🇿 Matthew LAWRENCE </div>
-<div class= "competitor GER"> 🇩🇪 Melvin IMOUDU </div>
-<div class= "competitor ASA"> 🇦🇸 Micah MASEI </div>
-<div class= "competitor MEX"> 🇲🇽 Miguel Alejandro de LARA OJEDA </div>
-<div class= "competitor USA"> 🇺🇸 Nic FINK </div>
-<div class= "competitor ITA"> 🇮🇹 Nicolo MARTINENGHI </div>
-<div class= "competitor CHN"> 🇨🇳 QIN Haiyang </div>
-<div class= "competitor ISR"> 🇮🇱 Ron POLONSKY </div>
-<div class= "competitor CHN"> 🇨🇳 SUN Jiajun </div>
-<div class= "competitor AUS"> 🇦🇺 Sam WILLIAMSON </div>
-<div class= "competitor LAO"> 🇱🇦 Steven INSIXIENGMAY </div>
-<div class= "competitor JPN"> 🇯🇵 TANIGUCHI Taku </div>
-<div class= "competitor FSM"> 🇫🇲 Tasi LIMTIACO </div>
+<div class= "competitor LAO"> 🇱🇦 Lao PDR </div>
+<div class= "competitor FSM"> 🇫🇲 Micronesia </div>
    </div>
  </div>
 </div>
@@ -2097,7 +2014,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240727T094500Z" data-end="20240727T101400Z" data-noc="GUY,UZB,CRC,MAS,CHI,MAR,BUL,AUT,SWE,KEN,MDA,SMR,BEL,GBR,GER,GER,VEN,HUN,FRA,EST,ITA,ITA,USA,USA,BIH,TUN,PER,CHN,CHN,AUS,AUS,LTU,BRA,BRA,MKD,SUI,KOR">
+<div class="event py-4" data-start="20240727T094500Z" data-end="20240727T101400Z" data-noc="AUS,AUT,BEL,BIH,BRA,BUL,CHI,CHN,CRC,EST,FRA,GBR,GER,GUY,HUN,ITA,KEN,KOR,LTU,MAR,MAS,MDA,MKD,PER,SMR,SUI,SWE,TUN,USA,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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -2106,43 +2023,8 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div class="">Men's 400m Freestyle - Heats
-<div class= "competitor USA"> 🇺🇸 Aaron SHACKELL </div>
-<div class= "competitor TUN"> 🇹🇳 Ahmed JAOUADI </div>
-<div class= "competitor CRC"> 🇨🇷 Alberto VEGA </div>
-<div class= "competitor VEN"> 🇻🇪 Alfonso Enrique MESTRE VIVAS </div>
-<div class= "competitor SUI"> 🇨🇭 Antonio DJAKOVIC </div>
-<div class= "competitor LTU"> 🇱🇹 Danas RAPSYS </div>
-<div class= "competitor FRA"> 🇫🇷 David AUBRY </div>
-<div class= "competitor CHI"> 🇨🇱 Eduardo CISTERNAS </div>
-<div class= "competitor BRA"> 🇧🇷 Eduardo OLIVEIRA de MORAES </div>
-<div class= "competitor AUS"> 🇦🇺 Elijah WINNINGTON </div>
-<div class= "competitor CHN"> 🇨🇳 FEI Liwei </div>
-<div class= "competitor AUT"> 🇦🇹 Felix AUBOECK </div>
-<div class= "competitor BRA"> 🇧🇷 Guilherme COSTA </div>
-<div class= "competitor MAS"> 🇲🇾 Hoe Yean KHIEW </div>
-<div class= "competitor MAR"> 🇲🇦 Ilias EL FALLAKI </div>
-<div class= "competitor UZB"> 🇺🇿 Ilya SIBIRTSEV </div>
-<div class= "competitor PER"> 🇵🇪 Joaquin VARGAS </div>
-<div class= "competitor BIH"> 🇧🇦 Jovan LEKIC </div>
-<div class= "competitor KOR"> 🇰🇷 KIM Woomin </div>
-<div class= "competitor GBR"> 🇬🇧 Kieran BIRD </div>
-<div class= "competitor USA"> 🇺🇸 Kieran SMITH </div>
-<div class= "competitor EST"> 🇪🇪 Kregor ZIRK </div>
-<div class= "competitor SMR"> 🇸🇲 Loris BIANCHI </div>
-<div class= "competitor BEL"> 🇧🇪 Lucas HENVEAUX </div>
-<div class= "competitor GER"> 🇩🇪 Lukas MAERTENS </div>
-<div class= "competitor ITA"> 🇮🇹 Marco de TULLIO </div>
-<div class= "competitor ITA"> 🇮🇹 Matteo LAMBERTI </div>
-<div class= "competitor MKD"> 🇲🇰 Nikola GJURETANOVIKJ </div>
-<div class= "competitor GER"> 🇩🇪 Oliver KLEMET </div>
-<div class= "competitor MDA"> 🇲🇩 Pavel ALOVATKI </div>
-<div class= "competitor BUL"> 🇧🇬 Petar Petrov MITSIN </div>
-<div class= "competitor GUY"> 🇬🇾 Raekwon Jibril NOEL </div>
-<div class= "competitor KEN"> 🇰🇪 Ridhwan Abubakar Bwana MOHAMED </div>
-<div class= "competitor AUS"> 🇦🇺 Samuel SHORT </div>
-<div class= "competitor SWE"> 🇸🇪 Victor JOHANSSON </div>
-<div class= "competitor CHN"> 🇨🇳 ZHANG Zhanshuo </div>
-<div class= "competitor HUN"> 🇭🇺 Zalan SARKANY </div>
+<div class= "competitor BIH"> 🇧🇦 Bosnia & Herzegovina </div>
+<div class= "competitor MDA"> 🇲🇩 Republic of Moldova </div>
    </div>
  </div>
 </div>
@@ -2418,7 +2300,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240727T101500Z" data-end="20240727T102600Z" data-noc="IRL,IRL,IRL,IRL,SWE,SWE,SWE,SWE,POL,POL,POL,POL,DEN,DEN,DEN,DEN,HUN,GBR,GBR,GBR,GBR,HUN,HUN,FRA,FRA,FRA,FRA,HUN,HKG,HKG,HKG,HKG,ITA,ITA,ITA,ITA,USA,USA,USA,USA,CHN,CHN,CHN,CHN,AUS,AUS,AUS,AUS,BRA,BRA,BRA,BRA,CAN,CAN,CAN,CAN,NED,NED,NED,NED,SLO,SLO,SLO,SLO">
+<div class="event py-4" data-start="20240727T101500Z" data-end="20240727T102600Z" data-noc="AUS,BRA,CAN,CHN,DEN,FRA,GBR,HKG,HUN,IRL,ITA,NED,POL,SLO,SWE,USA">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -2427,70 +2309,7 @@
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
    <div class="">Women's 4 x 100m Freestyle Relay - Heats
-<div class= "competitor HKG"> 🇭🇰 AU Hoi Shun Stephanie </div>
-<div class= "competitor USA"> 🇺🇸 Abbey WEITZEIL </div>
-<div class= "competitor BRA"> 🇧🇷 Ana Carolina VIEIRA </div>
-<div class= "competitor GBR"> 🇬🇧 Anna HOPKIN </div>
-<div class= "competitor FRA"> 🇫🇷 Beryl GASTALDELLO </div>
-<div class= "competitor AUS"> 🇦🇺 Bronte CAMPBELL </div>
-<div class= "competitor CAN"> 🇨🇦 Brooklyn DOUTHWRIGHT </div>
-<div class= "competitor HKG"> 🇭🇰 CHENG Camille Lily Mei </div>
-<div class= "competitor CHN"> 🇨🇳 CHENG Yujie </div>
-<div class= "competitor FRA"> 🇫🇷 Charlotte BONNET </div>
-<div class= "competitor ITA"> 🇮🇹 Chiara TARANTINO </div>
-<div class= "competitor IRL"> 🇮🇪 Danielle HILL </div>
-<div class= "competitor DEN"> 🇩🇰 Elisabeth Sabroe EBBESEN </div>
-<div class= "competitor AUS"> 🇦🇺 Emma McKEON </div>
-<div class= "competitor ITA"> 🇮🇹 Emma Virginia MENICUCCI </div>
-<div class= "competitor USA"> 🇺🇸 Erika CONNOLLY </div>
-<div class= "competitor IRL"> 🇮🇪 Erin RIORDAN </div>
-<div class= "competitor GBR"> 🇬🇧 Eva OKARO </div>
-<div class= "competitor GBR"> 🇬🇧 Freya ANDERSON </div>
-<div class= "competitor BRA"> 🇧🇷 Giovana MEDEIROS </div>
-<div class= "competitor IRL"> 🇮🇪 Grace DAVISON </div>
-<div class= "competitor SLO"> 🇸🇮 Janja SEGEL </div>
-<div class= "competitor POL"> 🇵🇱 Julia MAIK </div>
-<div class= "competitor DEN"> 🇩🇰 Julie Kepp JENSEN </div>
-<div class= "competitor HKG"> 🇭🇰 KAN Cheuk Tung Natalie </div>
-<div class= "competitor POL"> 🇵🇱 Katarzyna WASICK </div>
-<div class= "competitor USA"> 🇺🇸 Kate DOUGLASS </div>
-<div class= "competitor SLO"> 🇸🇮 Katja FAIN </div>
-<div class= "competitor NED"> 🇳🇱 Kim BUSCH </div>
-<div class= "competitor POL"> 🇵🇱 Kornelia FIEDKIEWICZ </div>
-<div class= "competitor HUN"> 🇭🇺 Lilla Minna ABRAHAM </div>
-<div class= "competitor FRA"> 🇫🇷 Lison NOWACZYK </div>
-<div class= "competitor GBR"> 🇬🇧 Lucy HOPE </div>
-<div class= "competitor BRA"> 🇧🇷 Maria Paula HEITMANN </div>
-<div class= "competitor NED"> 🇳🇱 Marrit STEENBERGEN </div>
-<div class= "competitor DEN"> 🇩🇰 Martine DAMBORG </div>
-<div class= "competitor FRA"> 🇫🇷 Mary-Ambre MOLUH </div>
-<div class= "competitor CAN"> 🇨🇦 Mary-Sophie HARVEY </div>
-<div class= "competitor AUS"> 🇦🇺 Meg HARRIS </div>
-<div class= "competitor SWE"> 🇸🇪 Michelle COLEMAN </div>
-<div class= "competitor SLO"> 🇸🇮 Neza KLANCAR </div>
-<div class= "competitor HUN"> 🇭🇺 Nikolett PADAR </div>
-<div class= "competitor AUS"> 🇦🇺 Olivia WUNSCH </div>
-<div class= "competitor HUN"> 🇭🇺 Panna UGRAI </div>
-<div class= "competitor CAN"> 🇨🇦 Penny OLEKSIAK </div>
-<div class= "competitor HUN"> 🇭🇺 Petra SENANSZKY </div>
-<div class= "competitor NED"> 🇳🇱 Sam van NUNEN </div>
-<div class= "competitor ITA"> 🇮🇹 Sara CURTIS </div>
-<div class= "competitor SWE"> 🇸🇪 Sara JUNEVIK </div>
-<div class= "competitor SWE"> 🇸🇪 Sarah SJOESTROEM </div>
-<div class= "competitor DEN"> 🇩🇰 Signe BRO </div>
-<div class= "competitor USA"> 🇺🇸 Simone MANUEL </div>
-<div class= "competitor SWE"> 🇸🇪 Sofia AASTEDT </div>
-<div class= "competitor ITA"> 🇮🇹 Sofia MORINI </div>
-<div class= "competitor BRA"> 🇧🇷 Stephanie BALDUCCINI </div>
-<div class= "competitor HKG"> 🇭🇰 TAM Hoi Lam </div>
-<div class= "competitor CAN"> 🇨🇦 Taylor RUCK </div>
-<div class= "competitor NED"> 🇳🇱 Tessa GIELE </div>
-<div class= "competitor SLO"> 🇸🇮 Tjasa PINTAR </div>
-<div class= "competitor IRL"> 🇮🇪 Victoria CATTERSON </div>
-<div class= "competitor CHN"> 🇨🇳 WU Qingfeng </div>
-<div class= "competitor CHN"> 🇨🇳 YANG Junxuan </div>
-<div class= "competitor CHN"> 🇨🇳 YU Yiting </div>
-<div class= "competitor POL"> 🇵🇱 Zuzanna FAMULOK </div>
+<div class= "competitor HKG"> 🇭🇰 Hong Kong, China </div>
    </div>
  </div>
 </div>
@@ -2520,7 +2339,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240727T102600Z" data-end="20240727T103600Z" data-noc="SWE,SWE,SWE,SWE,POL,POL,POL,POL,ISR,ISR,ISR,ISR,HUN,GBR,GBR,GBR,GBR,HUN,HUN,GER,GER,GER,GER,HUN,FRA,FRA,FRA,FRA,ITA,ITA,ITA,ITA,USA,USA,USA,USA,CHN,CHN,CHN,CHN,AUS,AUS,AUS,AUS,SRB,SRB,SRB,SRB,BRA,BRA,BRA,BRA,GRE,GRE,GRE,GRE,ESP,ESP,ESP,ESP,CAN,CAN,CAN,CAN">
+<div class="event py-4" data-start="20240727T102600Z" data-end="20240727T103600Z" data-noc="AUS,BRA,CAN,CHN,ESP,FRA,GBR,GER,GRE,HUN,ISR,ITA,POL,SRB,SWE,USA">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -2529,70 +2348,6 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div class="">Men's 4 x 100m Freestyle Relay - Heats
-<div class= "competitor HUN"> 🇭🇺 Adam JASZO </div>
-<div class= "competitor GBR"> 🇬🇧 Alexander COHOON </div>
-<div class= "competitor ISR"> 🇮🇱 Alexey GLIVINSKIY </div>
-<div class= "competitor GRE"> 🇬🇷 Andreas VAZAIOS </div>
-<div class= "competitor SRB"> 🇷🇸 Andrej BARNA </div>
-<div class= "competitor POL"> 🇵🇱 Bartosz PISZCZOROWICZ </div>
-<div class= "competitor SWE"> 🇸🇪 Bjoern SEELIGER </div>
-<div class= "competitor BRA"> 🇧🇷 Breno CORREIA </div>
-<div class= "competitor CHN"> 🇨🇳 CHEN Juner </div>
-<div class= "competitor USA"> 🇺🇸 Caeleb DRESSEL </div>
-<div class= "competitor ESP"> 🇪🇸 Cesar CASTRO VALLE </div>
-<div class= "competitor ISR"> 🇮🇱 Denis LOKTEV </div>
-<div class= "competitor POL"> 🇵🇱 Dominik DUDYS </div>
-<div class= "competitor GBR"> 🇬🇧 Duncan SCOTT </div>
-<div class= "competitor SWE"> 🇸🇪 Elias PERSSON </div>
-<div class= "competitor CAN"> 🇨🇦 Finlay KNOX </div>
-<div class= "competitor AUS"> 🇦🇺 Flynn SOUTHAM </div>
-<div class= "competitor BRA"> 🇧🇷 Gabriel SANTOS </div>
-<div class= "competitor ISR"> 🇮🇱 Gal COHEN GROUMI </div>
-<div class= "competitor BRA"> 🇧🇷 Guilherme SANTOS </div>
-<div class= "competitor FRA"> 🇫🇷 Guillaume GUTH </div>
-<div class= "competitor FRA"> 🇫🇷 Hadrien SALVAN </div>
-<div class= "competitor HUN"> 🇭🇺 Hubert KOS </div>
-<div class= "competitor USA"> 🇺🇸 Hunter ARMSTRONG </div>
-<div class= "competitor SWE"> 🇸🇪 Isak ELIASSON </div>
-<div class= "competitor CHN"> 🇨🇳 JI Xinjie </div>
-<div class= "competitor AUS"> 🇦🇺 Jack CARTWRIGHT </div>
-<div class= "competitor GBR"> 🇬🇧 Jacob Henry WHITTLE </div>
-<div class= "competitor CAN"> 🇨🇦 Javier ACEVEDO </div>
-<div class= "competitor CAN"> 🇨🇦 Josh LIENDO </div>
-<div class= "competitor GER"> 🇩🇪 Josha SALCHOW </div>
-<div class= "competitor SRB"> 🇷🇸 Justin CVETKOV </div>
-<div class= "competitor POL"> 🇵🇱 Kamil SIERADZKI </div>
-<div class= "competitor AUS"> 🇦🇺 Kyle CHALMERS </div>
-<div class= "competitor ITA"> 🇮🇹 Leonardo DEPLANO </div>
-<div class= "competitor ITA"> 🇮🇹 Lorenzo ZAZZERI </div>
-<div class= "competitor GER"> 🇩🇪 Luca ARMBRUSTER </div>
-<div class= "competitor ESP"> 🇪🇸 Luis DOMINGUEZ </div>
-<div class= "competitor ITA"> 🇮🇹 Manuel FRIGO </div>
-<div class= "competitor BRA"> 🇧🇷 Marcelo CHIERIGHINI </div>
-<div class= "competitor ESP"> 🇪🇸 Mario MOLLA YANES </div>
-<div class= "competitor POL"> 🇵🇱 Mateusz CHOWANIEC </div>
-<div class= "competitor USA"> 🇺🇸 Matt KING </div>
-<div class= "competitor HUN"> 🇭🇺 Nandor NEMETH </div>
-<div class= "competitor SRB"> 🇷🇸 Nikola ACIN </div>
-<div class= "competitor GRE"> 🇬🇷 Odyssefs MELADINIS </div>
-<div class= "competitor CHN"> 🇨🇳 PAN Zhanle </div>
-<div class= "competitor GRE"> 🇬🇷 Panagiotis BOLANOS </div>
-<div class= "competitor ITA"> 🇮🇹 Paolo CONTE BONIN </div>
-<div class= "competitor GER"> 🇩🇪 Peter VARJASI </div>
-<div class= "competitor FRA"> 🇫🇷 Rafael FENTE--DAMERS </div>
-<div class= "competitor GER"> 🇩🇪 Rafael MIROSLAW </div>
-<div class= "competitor SWE"> 🇸🇪 Robin HANSON </div>
-<div class= "competitor USA"> 🇺🇸 Ryan HELD </div>
-<div class= "competitor ESP"> 🇪🇸 Sergio de CELIS MONTALBAN </div>
-<div class= "competitor GRE"> 🇬🇷 Stergios Marios BILAS </div>
-<div class= "competitor HUN"> 🇭🇺 Szebasztian SZABO </div>
-<div class= "competitor GBR"> 🇬🇧 Tom DEAN </div>
-<div class= "competitor ISR"> 🇮🇱 Tomer FRANKEL </div>
-<div class= "competitor SRB"> 🇷🇸 Velimir STJEPANOVIC </div>
-<div class= "competitor FRA"> 🇫🇷 W. Amazigh YEBBA </div>
-<div class= "competitor CHN"> 🇨🇳 WANG Haoyu </div>
-<div class= "competitor AUS"> 🇦🇺 William YANG </div>
-<div class= "competitor CAN"> 🇨🇦 Yuri KISIL </div>
    </div>
  </div>
 </div>
@@ -4872,7 +4627,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240727T183000Z" data-end="20240727T184200Z" data-noc="SWE,JPN,CZE,GBR,GER,FRA,BEL,USA,USA,CHN,AUS,AUS,RSA,JPN,CAN,NED">
+<div class="event py-4" data-start="20240727T183000Z" data-end="20240727T184200Z" data-noc="AUS,BEL,CAN,CHN,CZE,FRA,GBR,GER,JPN,NED,RSA,SWE,USA">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -4881,22 +4636,6 @@
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
    <div class="">Women's 100m Butterfly Semifinals
-<div class= "competitor AUS"> 🇦🇺 Alexandria PERKINS </div>
-<div class= "competitor GER"> 🇩🇪 Angelina KOEHLER </div>
-<div class= "competitor CZE"> 🇨🇿 Barbora SEEMANOVA </div>
-<div class= "competitor AUS"> 🇦🇺 Emma McKEON </div>
-<div class= "competitor RSA"> 🇿🇦 Erin GALLAGHER </div>
-<div class= "competitor USA"> 🇺🇸 Gretchen WALSH </div>
-<div class= "competitor JPN"> 🇯🇵 HIRAI Mizuki </div>
-<div class= "competitor JPN"> 🇯🇵 IKEE Rikako </div>
-<div class= "competitor GBR"> 🇬🇧 Keanna Louise MACINNES </div>
-<div class= "competitor SWE"> 🇸🇪 Louise HANSSON </div>
-<div class= "competitor CAN"> 🇨🇦 Margaret MAC NEIL </div>
-<div class= "competitor FRA"> 🇫🇷 Marie WATTEL </div>
-<div class= "competitor BEL"> 🇧🇪 Roos VANOTTERDIJK </div>
-<div class= "competitor NED"> 🇳🇱 Tessa GIELE </div>
-<div class= "competitor USA"> 🇺🇸 Torri HUSKE </div>
-<div class= "competitor CHN"> 🇨🇳 ZHANG Yufei </div>
    </div>
  </div>
 </div>
@@ -5176,7 +4915,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240727T191200Z" data-end="20240727T202600Z" data-noc="AUT,ISR,GBR,GER,GER,ITA,ITA,USA,USA,CHN,AUS,GBR,NED,NED">
+<div class="event py-4" data-start="20240727T191200Z" data-end="20240727T202600Z" data-noc="AUS,AUT,CHN,GBR,GER,ISR,ITA,NED,USA">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -5185,20 +4924,6 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div class="">Men's 100m Breaststroke Semifinals
-<div class= "competitor GBR"> 🇬🇧 Adam PEATY </div>
-<div class= "competitor NED"> 🇳🇱 Arno KAMMINGA </div>
-<div class= "competitor AUT"> 🇦🇹 Bernhard REITSHAMMER </div>
-<div class= "competitor NED"> 🇳🇱 Caspar CORBEAU </div>
-<div class= "competitor USA"> 🇺🇸 Charlie SWANSON </div>
-<div class= "competitor GBR"> 🇬🇧 James WILBY </div>
-<div class= "competitor AUS"> 🇦🇺 Joshua YONG </div>
-<div class= "competitor GER"> 🇩🇪 Lucas MATZERATH </div>
-<div class= "competitor ITA"> 🇮🇹 Ludovico Blu Art VIBERTI </div>
-<div class= "competitor GER"> 🇩🇪 Melvin IMOUDU </div>
-<div class= "competitor USA"> 🇺🇸 Nic FINK </div>
-<div class= "competitor ITA"> 🇮🇹 Nicolo MARTINENGHI </div>
-<div class= "competitor CHN"> 🇨🇳 QIN Haiyang </div>
-<div class= "competitor ISR"> 🇮🇱 Ron POLONSKY </div>
    </div>
  </div>
 </div>
@@ -6834,7 +6559,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T090000Z" data-end="20240728T091400Z" data-noc="MEX,ROU,AUT,JPN,BEL,ISR,KOR,GBR,GBR,HUN,GER,GER,ITA,ITA,USA,USA,CHN,CHN,AUS,AUS,SRB,LTU,BRA,SUI,SYR,SLO,PAK,KOR">
+<div class="event py-4" data-start="20240728T090000Z" data-end="20240728T091400Z" data-noc="AUS,AUT,BEL,BRA,CHN,GBR,GER,HUN,ISR,ITA,JPN,KOR,LTU,MEX,PAK,ROU,SLO,SRB,SUI,SYR,USA">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -6843,34 +6568,6 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div class="">Men's 200m Freestyle - Heats
-<div class= "competitor ITA"> 🇮🇹 Alessandro RAGAINI </div>
-<div class= "competitor SUI"> 🇨🇭 Antonio DJAKOVIC </div>
-<div class= "competitor USA"> 🇺🇸 Chris GUILIANO </div>
-<div class= "competitor LTU"> 🇱🇹 Danas RAPSYS </div>
-<div class= "competitor ROU"> 🇷🇴 David POPOVICI </div>
-<div class= "competitor ISR"> 🇮🇱 Denis LOKTEV </div>
-<div class= "competitor GBR"> 🇬🇧 Duncan SCOTT </div>
-<div class= "competitor AUT"> 🇦🇹 Felix AUBOECK </div>
-<div class= "competitor ITA"> 🇮🇹 Filippo MEGLI </div>
-<div class= "competitor BRA"> 🇧🇷 Guilherme COSTA </div>
-<div class= "competitor KOR"> 🇰🇷 HWANG Sunwoo </div>
-<div class= "competitor CHN"> 🇨🇳 JI Xinjie </div>
-<div class= "competitor MEX"> 🇲🇽 Jorge IGA </div>
-<div class= "competitor KOR"> 🇰🇷 KIM Woomin </div>
-<div class= "competitor BEL"> 🇧🇪 Lucas HENVEAUX </div>
-<div class= "competitor GER"> 🇩🇪 Lukas MAERTENS </div>
-<div class= "competitor USA"> 🇺🇸 Luke HOBSON </div>
-<div class= "competitor JPN"> 🇯🇵 MATSUMOTO Katsuhiro </div>
-<div class= "competitor GBR"> 🇬🇧 Matthew RICHARDS </div>
-<div class= "competitor AUS"> 🇦🇺 Maximillian GIULIANI </div>
-<div class= "competitor PAK"> 🇵🇰 Muhammad Ahmed DURRANI </div>
-<div class= "competitor HUN"> 🇭🇺 Nandor NEMETH </div>
-<div class= "competitor SYR"> 🇸🇾 Omar ABBAS </div>
-<div class= "competitor CHN"> 🇨🇳 PAN Zhanle </div>
-<div class= "competitor GER"> 🇩🇪 Rafael MIROSLAW </div>
-<div class= "competitor SLO"> 🇸🇮 Saso BOSKAN </div>
-<div class= "competitor AUS"> 🇦🇺 Thomas NEILL </div>
-<div class= "competitor SRB"> 🇷🇸 Velimir STJEPANOVIC </div>
    </div>
  </div>
 </div>
@@ -6987,7 +6684,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T091500Z" data-end="20240728T092700Z" data-noc="JPN,HUN,GER,FRA,HUN,ITA,USA,USA,NZL,CHN,AUS,AUS,GRE,JPN,CAN,GBR">
+<div class="event py-4" data-start="20240728T091500Z" data-end="20240728T092700Z" data-noc="AUS,CAN,CHN,FRA,GBR,GER,GRE,HUN,ITA,JPN,NZL,USA">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -6996,22 +6693,6 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div class="">Men's 400m Individual Medley - Heats
-<div class= "competitor ITA"> 🇮🇹 Alberto RAZZETTI </div>
-<div class= "competitor GRE"> 🇬🇷 Apostolos PAPASTAMOS </div>
-<div class= "competitor HUN"> 🇭🇺 Balazs HOLLO </div>
-<div class= "competitor AUS"> 🇦🇺 Brendon SMITH </div>
-<div class= "competitor USA"> 🇺🇸 Carson FOSTER </div>
-<div class= "competitor GER"> 🇩🇪 Cedric BUESSING </div>
-<div class= "competitor USA"> 🇺🇸 Chase KALISZ </div>
-<div class= "competitor HUN"> 🇭🇺 Gabor ZOMBORI </div>
-<div class= "competitor FRA"> 🇫🇷 Leon MARCHAND </div>
-<div class= "competitor NZL"> 🇳🇿 Lewis CLAREBURT </div>
-<div class= "competitor JPN"> 🇯🇵 MATSUSHITA Tomoyuki </div>
-<div class= "competitor GBR"> 🇬🇧 Max LITCHFIELD </div>
-<div class= "competitor JPN"> 🇯🇵 SETO Daiya </div>
-<div class= "competitor CAN"> 🇨🇦 Tristan JANKOVICS </div>
-<div class= "competitor AUS"> 🇦🇺 William Campbell PETRIC </div>
-<div class= "competitor CHN"> 🇨🇳 ZHANG Zhanshuo </div>
    </div>
  </div>
 </div>
@@ -7132,7 +6813,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T092700Z" data-end="20240728T094200Z" data-noc="SGP,ARG,IRL,COL,GAM,ANT,MAR,SWE,COK,POL,JPN,JPN,CZE,ISR,GER,FIN,EST,ITA,ITA,KUW,USA,USA,CHN,CHN,AUS,LTU,LTU,ESP,RSA,PAN,CAN,NED,LBN,SUI,GBR,MAS">
+<div class="event py-4" data-start="20240728T092700Z" data-end="20240728T094200Z" data-noc="ANT,ARG,AUS,CAN,CHN,COK,COL,CZE,ESP,EST,FIN,GAM,GBR,GER,IRL,ISR,ITA,JPN,KUW,LBN,LTU,MAR,MAS,NED,PAN,POL,RSA,SGP,SUI,SWE,USA">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -7141,42 +6822,6 @@
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
    <div class="">Women's 100m Breaststroke - Heats
-<div class= "competitor JPN"> 🇯🇵 AOKI Reona </div>
-<div class= "competitor GAM"> 🇬🇲 Aminata Nia-Maria BARROW </div>
-<div class= "competitor ISR"> 🇮🇱 Anastasia GORBENKO </div>
-<div class= "competitor GBR"> 🇬🇧 Angharad EVANS </div>
-<div class= "competitor GER"> 🇩🇪 Anna ELENDT </div>
-<div class= "competitor ITA"> 🇮🇹 Benedetta PILATO </div>
-<div class= "competitor POL"> 🇵🇱 Dominika SZTANDERA </div>
-<div class= "competitor ANT"> 🇦🇬 Ellie SHAW </div>
-<div class= "competitor PAN"> 🇵🇦 Emily SANTOS SILVA </div>
-<div class= "competitor USA"> 🇺🇸 Emma WEBER </div>
-<div class= "competitor SGP"> 🇸🇬 En Yi Letitia SIM </div>
-<div class= "competitor EST"> 🇪🇪 Eneli JEFIMOVA </div>
-<div class= "competitor FIN"> 🇫🇮 Ida HULKKO </div>
-<div class= "competitor MAR"> 🇲🇦 Imane Houda EL BARODI </div>
-<div class= "competitor AUS"> 🇦🇺 Jenna STRAUCH </div>
-<div class= "competitor ESP"> 🇪🇸 Jessica VALL MONTERO </div>
-<div class= "competitor LTU"> 🇱🇹 Kotryna TETEREVKOVA </div>
-<div class= "competitor CZE"> 🇨🇿 Kristyna HORSKA </div>
-<div class= "competitor COK"> 🇨🇰 Lanihei CONNOLLY </div>
-<div class= "competitor KUW"> 🇰🇼 Lara DASHTI </div>
-<div class= "competitor USA"> 🇺🇸 Lilly KING </div>
-<div class= "competitor ITA"> 🇮🇹 Lisa ANGIOLINI </div>
-<div class= "competitor SUI"> 🇨🇭 Lisa MAMIE </div>
-<div class= "competitor LBN"> 🇱🇧 Lynn EL HAJJ </div>
-<div class= "competitor ARG"> 🇦🇷 Macarena CEBALLOS </div>
-<div class= "competitor IRL"> 🇮🇪 Mona Mc SHARRY </div>
-<div class= "competitor MAS"> 🇲🇾 Rouxin TAN </div>
-<div class= "competitor LTU"> 🇱🇹 Ruta MEILUTYTE </div>
-<div class= "competitor JPN"> 🇯🇵 SUZUKI Satomi </div>
-<div class= "competitor CAN"> 🇨🇦 Sophie ANGUS </div>
-<div class= "competitor SWE"> 🇸🇪 Sophie HANSSON </div>
-<div class= "competitor COL"> 🇨🇴 Stefania GOMEZ HURTADO </div>
-<div class= "competitor CHN"> 🇨🇳 TANG Qianting </div>
-<div class= "competitor RSA"> 🇿🇦 Tatjana SMITH </div>
-<div class= "competitor NED"> 🇳🇱 Tes SCHOUTEN </div>
-<div class= "competitor CHN"> 🇨🇳 YANG Chang </div>
    </div>
  </div>
 </div>
@@ -7348,7 +6993,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T094300Z" data-end="20240728T095900Z" data-noc="ARG,ISV,IND,PUR,GRN,UKR,AUT,GEO,POL,TUR,CZE,ISR,BER,KOR,HUN,GBR,HUN,GER,GER,FRA,FRA,BEN,COL,BRU,ITA,ITA,USA,USA,NZL,TGA,CHN,AUS,AUS,POR,PLE,GRE,GRE,ESP,RSA,JPN,CAN,CAN,NED,SUI,SUI,GBR">
+<div class="event py-4" data-start="20240728T094300Z" data-end="20240728T095900Z" data-noc="ARG,AUS,AUT,BEN,BER,BRU,CAN,CHN,COL,CZE,ESP,FRA,GBR,GEO,GER,GRE,GRN,HUN,IND,ISR,ISV,ITA,JPN,KOR,NED,NZL,PLE,POL,POR,PUR,RSA,SUI,TGA,TUR,UKR,USA">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -7357,52 +7002,8 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div class="">Men's 100m Backstroke - Heats
-<div class= "competitor HUN"> 🇭🇺 Adam JASZO </div>
-<div class= "competitor ISR"> 🇮🇱 Adam MARAANA </div>
-<div class= "competitor TGA"> 🇹🇴 Alan Koti Lopeti UHI </div>
-<div class= "competitor BEN"> 🇧🇯 Alexis Michel Roger Dodji KPADE </div>
-<div class= "competitor COL"> 🇨🇴 Anthony RINCON VELASCO </div>
-<div class= "competitor GRE"> 🇬🇷 Apostolos CHRISTOU </div>
-<div class= "competitor TUR"> 🇹🇷 Berke SAKA </div>
-<div class= "competitor AUT"> 🇦🇹 Bernhard REITSHAMMER </div>
-<div class= "competitor CAN"> 🇨🇦 Blake TIERNEY </div>
-<div class= "competitor AUS"> 🇦🇺 Bradley WOODWARD </div>
-<div class= "competitor GRE"> 🇬🇷 Evangelos MAKRYGIANNIS </div>
-<div class= "competitor HUN"> 🇭🇺 Hubert KOS </div>
-<div class= "competitor ESP"> 🇪🇸 Hugo GONZALEZ de OLIVEIRA </div>
-<div class= "competitor USA"> 🇺🇸 Hunter ARMSTRONG </div>
-<div class= "competitor AUS"> 🇦🇺 Isaac COOPER </div>
-<div class= "competitor BER"> 🇧🇲 Jack HARVEY </div>
-<div class= "competitor CAN"> 🇨🇦 Javier ACEVEDO </div>
-<div class= "competitor POR"> 🇵🇹 Joao COSTA </div>
-<div class= "competitor GBR"> 🇬🇧 Jonny MARSHALL </div>
-<div class= "competitor NED"> 🇳🇱 Kai van WESTERING </div>
-<div class= "competitor NZL"> 🇳🇿 Kane FOLLOWS </div>
-<div class= "competitor POL"> 🇵🇱 Ksawery MASIUK </div>
-<div class= "competitor KOR"> 🇰🇷 LEE Juho </div>
-<div class= "competitor JPN"> 🇯🇵 MATSUYAMA Riku </div>
-<div class= "competitor GER"> 🇩🇪 Marek ULRICH </div>
-<div class= "competitor ISV"> 🇻🇮 Maximillian WILSON </div>
-<div class= "competitor FRA"> 🇫🇷 Mewen TOMAC </div>
-<div class= "competitor ITA"> 🇮🇹 Michele LAMBERTI </div>
-<div class= "competitor CZE"> 🇨🇿 Miroslav KNEDLA </div>
-<div class= "competitor GEO"> 🇬🇪 Noe PANSTKHAVA </div>
-<div class= "competitor GER"> 🇩🇪 Ole BRAUNSCHWEIG </div>
-<div class= "competitor UKR"> 🇺🇦 Oleksandr ZHELTIAKOV </div>
-<div class= "competitor GBR"> 🇬🇧 Oliver MORGAN </div>
-<div class= "competitor RSA"> 🇿🇦 Pieter COETZE </div>
-<div class= "competitor SUI"> 🇨🇭 Roman MITYUKOV </div>
-<div class= "competitor USA"> 🇺🇸 Ryan MURPHY </div>
-<div class= "competitor IND"> 🇮🇳 Srihari NATARAJ </div>
-<div class= "competitor SUI"> 🇨🇭 Thierry BOLLIN </div>
-<div class= "competitor ITA"> 🇮🇹 Thomas CECCON </div>
-<div class= "competitor ARG"> 🇦🇷 Ulises SARAVIA </div>
-<div class= "competitor CHN"> 🇨🇳 XU Jiayu </div>
-<div class= "competitor PLE"> 🇵🇸 Yazan AL BAWWAB </div>
-<div class= "competitor PUR"> 🇵🇷 Yeziel MORALES </div>
-<div class= "competitor FRA"> 🇫🇷 Yohann NDOYE-BROUARD </div>
-<div class= "competitor GRN"> 🇬🇩 Zackary GRESHAM </div>
-<div class= "competitor BRU"> 🇧🇳 Zeke CHAN </div>
+<div class= "competitor BRU"> 🇧🇳 Brunei Darussalam </div>
+<div class= "competitor ISV"> 🇻🇮 Virgin Islands, US </div>
    </div>
  </div>
 </div>
@@ -7628,7 +7229,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T100000Z" data-end="20240728T101600Z" data-noc="CUB,ROU,IND,ALB,MGL,EGY,CZE,BEL,ISR,HUN,HUN,GER,PAK,VEN,HKG,HON,ISL,USA,USA,NZL,CHN,CHN,AUS,AUS,BRA,KSA,RSA,LAO,CAN,NEP,UAE">
+<div class="event py-4" data-start="20240728T100000Z" data-end="20240728T101600Z" data-noc="ALB,AUS,BEL,BRA,CAN,CHN,CUB,CZE,EGY,GER,HKG,HON,HUN,IND,ISL,ISR,KSA,LAO,MGL,NEP,NZL,PAK,ROU,RSA,UAE,USA,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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -7637,37 +7238,9 @@
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
    <div class="">Women's 200m Freestyle - Heats
-<div class= "competitor RSA"> 🇿🇦 Aimee CANNY </div>
-<div class= "competitor CUB"> 🇨🇺 Andrea BECALI </div>
-<div class= "competitor LAO"> 🇱🇦 Ariana Southa DIRKZWAGER </div>
-<div class= "competitor AUS"> 🇦🇺 Ariarne TITMUS </div>
-<div class= "competitor CZE"> 🇨🇿 Barbora SEEMANOVA </div>
-<div class= "competitor USA"> 🇺🇸 Claire WEINSTEIN </div>
-<div class= "competitor IND"> 🇮🇳 Dhinidhi DESINGHU </div>
-<div class= "competitor NEP"> 🇳🇵 Duana LAMA </div>
-<div class= "competitor MGL"> 🇲🇳 Enkhkhuslen BATBAYAR </div>
-<div class= "competitor NZL"> 🇳🇿 Erika FAIRWEATHER </div>
-<div class= "competitor USA"> 🇺🇸 Erin GEMMELL </div>
-<div class= "competitor HKG"> 🇭🇰 HAUGHEY Siobhan Bernadette </div>
-<div class= "competitor PAK"> 🇵🇰 Jehanara NABI </div>
-<div class= "competitor GER"> 🇩🇪 Julia MROZINSKI </div>
-<div class= "competitor HON"> 🇭🇳 Julimar AVILA MANCIA </div>
-<div class= "competitor ALB"> 🇦🇱 Kaltra MECA </div>
-<div class= "competitor CHN"> 🇨🇳 LI Bingjie </div>
-<div class= "competitor ISR"> 🇮🇱 Lea POLONSKY </div>
-<div class= "competitor HUN"> 🇭🇺 Lilla Minna ABRAHAM </div>
-<div class= "competitor EGY"> 🇪🇬 Lojine ABDALLA SALAH </div>
-<div class= "competitor UAE"> 🇦🇪 Maha ALSHEHHI </div>
-<div class= "competitor BRA"> 🇧🇷 Maria Fernanda COSTA </div>
-<div class= "competitor VEN"> 🇻🇪 Maria Victoria YEGRES COTTIN </div>
-<div class= "competitor CAN"> 🇨🇦 Mary-Sophie HARVEY </div>
-<div class= "competitor KSA"> 🇸🇦 Mashael Meshari A ALAYED </div>
-<div class= "competitor AUS"> 🇦🇺 Mollie O'CALLAGHAN </div>
-<div class= "competitor HUN"> 🇭🇺 Nikolett PADAR </div>
-<div class= "competitor ROU"> 🇷🇴 Rebecca-Aimee DIACONESCU </div>
-<div class= "competitor ISL"> 🇮🇸 Snaefridur Sol JORUNNARDOTTIR </div>
-<div class= "competitor BEL"> 🇧🇪 Valentine DUMONT </div>
-<div class= "competitor CHN"> 🇨🇳 YANG Junxuan </div>
+<div class= "competitor HKG"> 🇭🇰 Hong Kong, China </div>
+<div class= "competitor LAO"> 🇱🇦 Lao PDR </div>
+<div class= "competitor UAE"> 🇦🇪 UA Emirates </div>
    </div>
  </div>
 </div>
@@ -10941,7 +10514,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T184600Z" data-end="20240728T190000Z" data-noc="ROU,JPN,BEL,ISR,KOR,GBR,GBR,GER,GER,ITA,ITA,USA,AUS,AUS,LTU,KOR">
+<div class="event py-4" data-start="20240728T184600Z" data-end="20240728T190000Z" data-noc="AUS,BEL,GBR,GER,ISR,ITA,JPN,KOR,LTU,ROU,USA">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -10950,22 +10523,6 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div class="">Men's 200m Freestyle Semifinals
-<div class= "competitor ITA"> 🇮🇹 Alessandro RAGAINI </div>
-<div class= "competitor LTU"> 🇱🇹 Danas RAPSYS </div>
-<div class= "competitor ROU"> 🇷🇴 David POPOVICI </div>
-<div class= "competitor ISR"> 🇮🇱 Denis LOKTEV </div>
-<div class= "competitor GBR"> 🇬🇧 Duncan SCOTT </div>
-<div class= "competitor ITA"> 🇮🇹 Filippo MEGLI </div>
-<div class= "competitor KOR"> 🇰🇷 HWANG Sunwoo </div>
-<div class= "competitor KOR"> 🇰🇷 KIM Woomin </div>
-<div class= "competitor BEL"> 🇧🇪 Lucas HENVEAUX </div>
-<div class= "competitor GER"> 🇩🇪 Lukas MAERTENS </div>
-<div class= "competitor USA"> 🇺🇸 Luke HOBSON </div>
-<div class= "competitor JPN"> 🇯🇵 MATSUMOTO Katsuhiro </div>
-<div class= "competitor GBR"> 🇬🇧 Matthew RICHARDS </div>
-<div class= "competitor AUS"> 🇦🇺 Maximillian GIULIANI </div>
-<div class= "competitor GER"> 🇩🇪 Rafael MIROSLAW </div>
-<div class= "competitor AUS"> 🇦🇺 Thomas NEILL </div>
    </div>
  </div>
 </div>
@@ -11226,7 +10783,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T191000Z" data-end="20240728T192200Z" data-noc="ARG,IRL,SWE,JPN,EST,ITA,ITA,USA,CHN,CHN,LTU,LTU,RSA,NED,GBR">
+<div class="event py-4" data-start="20240728T191000Z" data-end="20240728T192200Z" data-noc="ARG,CHN,EST,GBR,IRL,ITA,JPN,LTU,NED,RSA,SWE,USA">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -11235,21 +10792,6 @@
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
    <div class="">Women's 100m Breaststroke Semifinals
-<div class= "competitor GBR"> 🇬🇧 Angharad EVANS </div>
-<div class= "competitor ITA"> 🇮🇹 Benedetta PILATO </div>
-<div class= "competitor EST"> 🇪🇪 Eneli JEFIMOVA </div>
-<div class= "competitor LTU"> 🇱🇹 Kotryna TETEREVKOVA </div>
-<div class= "competitor USA"> 🇺🇸 Lilly KING </div>
-<div class= "competitor ITA"> 🇮🇹 Lisa ANGIOLINI </div>
-<div class= "competitor ARG"> 🇦🇷 Macarena CEBALLOS </div>
-<div class= "competitor IRL"> 🇮🇪 Mona Mc SHARRY </div>
-<div class= "competitor LTU"> 🇱🇹 Ruta MEILUTYTE </div>
-<div class= "competitor JPN"> 🇯🇵 SUZUKI Satomi </div>
-<div class= "competitor SWE"> 🇸🇪 Sophie HANSSON </div>
-<div class= "competitor CHN"> 🇨🇳 TANG Qianting </div>
-<div class= "competitor RSA"> 🇿🇦 Tatjana SMITH </div>
-<div class= "competitor NED"> 🇳🇱 Tes SCHOUTEN </div>
-<div class= "competitor CHN"> 🇨🇳 YANG Chang </div>
    </div>
  </div>
 </div>
@@ -11305,7 +10847,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T193200Z" data-end="20240728T194400Z" data-noc="POL,CZE,GBR,HUN,FRA,FRA,ITA,USA,USA,CHN,GRE,GRE,ESP,RSA,CAN,GBR">
+<div class="event py-4" data-start="20240728T193200Z" data-end="20240728T194400Z" data-noc="CAN,CHN,CZE,ESP,FRA,GBR,GRE,HUN,ITA,POL,RSA,USA">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -11314,22 +10856,6 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div class="">Men's 100m Backstroke Semifinals
-<div class= "competitor GRE"> 🇬🇷 Apostolos CHRISTOU </div>
-<div class= "competitor CAN"> 🇨🇦 Blake TIERNEY </div>
-<div class= "competitor GRE"> 🇬🇷 Evangelos MAKRYGIANNIS </div>
-<div class= "competitor HUN"> 🇭🇺 Hubert KOS </div>
-<div class= "competitor ESP"> 🇪🇸 Hugo GONZALEZ de OLIVEIRA </div>
-<div class= "competitor USA"> 🇺🇸 Hunter ARMSTRONG </div>
-<div class= "competitor GBR"> 🇬🇧 Jonny MARSHALL </div>
-<div class= "competitor POL"> 🇵🇱 Ksawery MASIUK </div>
-<div class= "competitor FRA"> 🇫🇷 Mewen TOMAC </div>
-<div class= "competitor CZE"> 🇨🇿 Miroslav KNEDLA </div>
-<div class= "competitor GBR"> 🇬🇧 Oliver MORGAN </div>
-<div class= "competitor RSA"> 🇿🇦 Pieter COETZE </div>
-<div class= "competitor USA"> 🇺🇸 Ryan MURPHY </div>
-<div class= "competitor ITA"> 🇮🇹 Thomas CECCON </div>
-<div class= "competitor CHN"> 🇨🇳 XU Jiayu </div>
-<div class= "competitor FRA"> 🇫🇷 Yohann NDOYE-BROUARD </div>
    </div>
  </div>
 </div>
@@ -11379,7 +10905,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T195000Z" data-end="20240728T200400Z" data-noc="ROU,CZE,BEL,HUN,HKG,ISL,USA,USA,NZL,CHN,CHN,AUS,AUS,BRA,RSA,CAN">
+<div class="event py-4" data-start="20240728T195000Z" data-end="20240728T200400Z" data-noc="AUS,BEL,BRA,CAN,CHN,CZE,HKG,HUN,ISL,NZL,ROU,RSA,USA">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -11388,22 +10914,7 @@
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
    <div class="">Women's 200m Freestyle Semifinals
-<div class= "competitor RSA"> 🇿🇦 Aimee CANNY </div>
-<div class= "competitor AUS"> 🇦🇺 Ariarne TITMUS </div>
-<div class= "competitor CZE"> 🇨🇿 Barbora SEEMANOVA </div>
-<div class= "competitor USA"> 🇺🇸 Claire WEINSTEIN </div>
-<div class= "competitor NZL"> 🇳🇿 Erika FAIRWEATHER </div>
-<div class= "competitor USA"> 🇺🇸 Erin GEMMELL </div>
-<div class= "competitor HKG"> 🇭🇰 HAUGHEY Siobhan Bernadette </div>
-<div class= "competitor CHN"> 🇨🇳 LI Bingjie </div>
-<div class= "competitor HUN"> 🇭🇺 Lilla Minna ABRAHAM </div>
-<div class= "competitor BRA"> 🇧🇷 Maria Fernanda COSTA </div>
-<div class= "competitor CAN"> 🇨🇦 Mary-Sophie HARVEY </div>
-<div class= "competitor AUS"> 🇦🇺 Mollie O'CALLAGHAN </div>
-<div class= "competitor ROU"> 🇷🇴 Rebecca-Aimee DIACONESCU </div>
-<div class= "competitor ISL"> 🇮🇸 Snaefridur Sol JORUNNARDOTTIR </div>
-<div class= "competitor BEL"> 🇧🇪 Valentine DUMONT </div>
-<div class= "competitor CHN"> 🇨🇳 YANG Junxuan </div>
+<div class= "competitor HKG"> 🇭🇰 Hong Kong, China </div>
    </div>
  </div>
 </div>
@@ -12823,7 +12334,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T090000Z" data-end="20240729T091200Z" data-noc="IRL,JPN,JPN,ISR,HUN,GBR,GBR,ITA,USA,USA,AUS,AUS,SRB,ESP,CAN,CAN">
+<div class="event py-4" data-start="20240729T090000Z" data-end="20240729T091200Z" data-noc="AUS,CAN,ESP,GBR,HUN,IRL,ISR,ITA,JPN,SRB,USA">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -12832,22 +12343,6 @@
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
    <div class="">Women's 400m Individual Medley - Heats
-<div class= "competitor ISR"> 🇮🇱 Anastasia GORBENKO </div>
-<div class= "competitor SRB"> 🇷🇸 Anja CREVAR </div>
-<div class= "competitor CAN"> 🇨🇦 Ella JANSEN </div>
-<div class= "competitor AUS"> 🇦🇺 Ella RAMSAY </div>
-<div class= "competitor IRL"> 🇮🇪 Ellen WALSHE </div>
-<div class= "competitor ESP"> 🇪🇸 Emma CARRASCO CADENS </div>
-<div class= "competitor USA"> 🇺🇸 Emma WEYANT </div>
-<div class= "competitor GBR"> 🇬🇧 Freya Constance COLBERT </div>
-<div class= "competitor AUS"> 🇦🇺 Jenna FORRESTER </div>
-<div class= "competitor USA"> 🇺🇸 Katie GRIMES </div>
-<div class= "competitor GBR"> 🇬🇧 Katie SHANAHAN </div>
-<div class= "competitor JPN"> 🇯🇵 NARITA Mio </div>
-<div class= "competitor ITA"> 🇮🇹 Sara FRANCESCHI </div>
-<div class= "competitor CAN"> 🇨🇦 Summer McINTOSH </div>
-<div class= "competitor JPN"> 🇯🇵 TANIGAWA Ageha </div>
-<div class= "competitor HUN"> 🇭🇺 Vivien JACKL </div>
    </div>
  </div>
 </div>
@@ -12955,7 +12450,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T091300Z" data-end="20240729T092700Z" data-noc="MEX,BER,BRN,IRL,MOZ,LBA,BUL,ESA,SWE,POL,ISR,GBR,GBR,FRA,FRA,TTO,BEL,HKG,TKM,KAZ,USA,USA,DOM,CHN,CHN,AUS,AUS,GUA,ESP,CAN,CAN,SRI,NED,NED,UKR">
+<div class="event py-4" data-start="20240729T091300Z" data-end="20240729T092700Z" data-noc="AUS,BEL,BER,BRN,BUL,CAN,CHN,DOM,ESA,ESP,FRA,GBR,GUA,HKG,IRL,ISR,KAZ,LBA,MEX,MOZ,NED,POL,SRI,SWE,TKM,TTO,UKR,USA">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -12964,41 +12459,7 @@
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
    <div class="">Women's 100m Backstroke - Heats
-<div class= "competitor POL"> 🇵🇱 Adela PISKORSKA </div>
-<div class= "competitor BRN"> 🇧🇭 Amani ALOBAIDLI </div>
-<div class= "competitor ISR"> 🇮🇱 Aviv BARZELAY </div>
-<div class= "competitor TKM"> 🇹🇲 Aynura PRIMOVA </div>
-<div class= "competitor FRA"> 🇫🇷 Beryl GASTALDELLO </div>
-<div class= "competitor HKG"> 🇭🇰 CHEUNG Sum Yuet Cindy </div>
-<div class= "competitor ESP"> 🇪🇸 Carmen WEILER SASTRE </div>
-<div class= "competitor MEX"> 🇲🇽 Celia PULIDO ORTIZ </div>
-<div class= "competitor ESA"> 🇸🇻 Celina MARQUEZ </div>
-<div class= "competitor IRL"> 🇮🇪 Danielle HILL </div>
-<div class= "competitor MOZ"> 🇲🇿 Denise DONELLI </div>
-<div class= "competitor DOM"> 🇩🇴 Elizabeth JIMENEZ </div>
-<div class= "competitor BER"> 🇧🇲 Emma HARVEY </div>
-<div class= "competitor FRA"> 🇫🇷 Emma TEREBO </div>
-<div class= "competitor BUL"> 🇧🇬 Gabriela GEORGIEVA </div>
-<div class= "competitor SRI"> 🇱🇰 Ganga SENAVIRATHNE </div>
-<div class= "competitor CAN"> 🇨🇦 Ingrid WILM </div>
-<div class= "competitor AUS"> 🇦🇺 Iona ANDERSON </div>
-<div class= "competitor USA"> 🇺🇸 Katharine BERKOFF </div>
-<div class= "competitor GBR"> 🇬🇧 Kathleen DAWSON </div>
-<div class= "competitor AUS"> 🇦🇺 Kaylee McKEOWN </div>
-<div class= "competitor NED"> 🇳🇱 Kira TOUSSAINT </div>
-<div class= "competitor CAN"> 🇨🇦 Kylie MASSE </div>
-<div class= "competitor SWE"> 🇸🇪 Louise HANSSON </div>
-<div class= "competitor GUA"> 🇬🇹 Lucero MEJIA </div>
-<div class= "competitor NED"> 🇳🇱 Maaike de WAARD </div>
-<div class= "competitor GBR"> 🇬🇧 Medi Eira HARRIS </div>
-<div class= "competitor LBA"> 🇱🇾 Mek ALMUKHTAR </div>
-<div class= "competitor UKR"> 🇺🇦 Nika SHARAFUTDINOVA </div>
-<div class= "competitor USA"> 🇺🇸 Regan SMITH </div>
-<div class= "competitor BEL"> 🇧🇪 Roos VANOTTERDIJK </div>
-<div class= "competitor CHN"> 🇨🇳 WAN Letian </div>
-<div class= "competitor CHN"> 🇨🇳 WANG Xueer </div>
-<div class= "competitor KAZ"> 🇰🇿 Xeniya IGNATOVA </div>
-<div class= "competitor TTO"> 🇹🇹 Zuri FERGUSON </div>
+<div class= "competitor HKG"> 🇭🇰 Hong Kong, China </div>
    </div>
  </div>
 </div>
@@ -13131,7 +12592,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T092800Z" data-end="20240729T100700Z" data-noc="IRL,ROU,VIE,UZB,MON,UKR,AUT,SWE,NOR,NOR,TUR,EGY,BEL,GER,GER,VEN,HUN,FRA,FRA,ITA,ITA,USA,USA,TUN,CHN,CHN,AUS,AUS,BRA,GRE,ESP">
+<div class="event py-4" data-start="20240729T092800Z" data-end="20240729T100700Z" data-noc="AUS,AUT,BEL,BRA,CHN,EGY,ESP,FRA,GER,GRE,HUN,IRL,ITA,MON,NOR,ROU,SWE,TUN,TUR,UKR,USA,UZB,VEN,VIE">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -13140,37 +12601,6 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div class="">Men's 800m Freestyle - Heats
-<div class= "competitor TUN"> 🇹🇳 Ahmed JAOUADI </div>
-<div class= "competitor VEN"> 🇻🇪 Alfonso Enrique MESTRE VIVAS </div>
-<div class= "competitor USA"> 🇺🇸 Bobby FINKE </div>
-<div class= "competitor ESP"> 🇪🇸 Carlos GARACH BENITO </div>
-<div class= "competitor IRL"> 🇮🇪 Daniel WIFFEN </div>
-<div class= "competitor FRA"> 🇫🇷 David AUBRY </div>
-<div class= "competitor GRE"> 🇬🇷 Dimitrios MARKOS </div>
-<div class= "competitor AUS"> 🇦🇺 Elijah WINNINGTON </div>
-<div class= "competitor CHN"> 🇨🇳 FEI Liwei </div>
-<div class= "competitor AUT"> 🇦🇹 Felix AUBOECK </div>
-<div class= "competitor GER"> 🇩🇪 Florian WELLBROCK </div>
-<div class= "competitor ITA"> 🇮🇹 Gregorio PALTRINIERI </div>
-<div class= "competitor BRA"> 🇧🇷 Guilherme COSTA </div>
-<div class= "competitor NOR"> 🇳🇴 Henrik CHRISTIANSEN </div>
-<div class= "competitor VIE"> 🇻🇳 Huy Hoang NGUYEN </div>
-<div class= "competitor UZB"> 🇺🇿 Ilya SIBIRTSEV </div>
-<div class= "competitor NOR"> 🇳🇴 Jon JOENTVEDT </div>
-<div class= "competitor TUR"> 🇹🇷 Kuzey TUNCELLI </div>
-<div class= "competitor ITA"> 🇮🇹 Luca de TULLIO </div>
-<div class= "competitor BEL"> 🇧🇪 Lucas HENVEAUX </div>
-<div class= "competitor USA"> 🇺🇸 Luke WHITLOCK </div>
-<div class= "competitor EGY"> 🇪🇬 Marwan ELKAMASH </div>
-<div class= "competitor UKR"> 🇺🇦 Mykhailo ROMANCHUK </div>
-<div class= "competitor FRA"> 🇫🇷 Pacome BRICOUT </div>
-<div class= "competitor AUS"> 🇦🇺 Samuel SHORT </div>
-<div class= "competitor GER"> 🇩🇪 Sven SCHWARZ </div>
-<div class= "competitor MON"> 🇲🇨 Theo DRUENNE </div>
-<div class= "competitor SWE"> 🇸🇪 Victor JOHANSSON </div>
-<div class= "competitor ROU"> 🇷🇴 Vlad Stefan STANCU </div>
-<div class= "competitor CHN"> 🇨🇳 ZHANG Zhanshuo </div>
-<div class= "competitor HUN"> 🇭🇺 Zalan SARKANY </div>
    </div>
  </div>
 </div>
@@ -16738,7 +16168,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T190100Z" data-end="20240729T191500Z" data-noc="IRL,SWE,FRA,FRA,BEL,USA,USA,CHN,CHN,AUS,AUS,ESP,CAN,CAN,NED,NED">
+<div class="event py-4" data-start="20240729T190100Z" data-end="20240729T191500Z" data-noc="AUS,BEL,CAN,CHN,ESP,FRA,IRL,NED,SWE,USA">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -16747,22 +16177,6 @@
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
    <div class="">Women's 100m Backstroke Semifinals
-<div class= "competitor FRA"> 🇫🇷 Beryl GASTALDELLO </div>
-<div class= "competitor ESP"> 🇪🇸 Carmen WEILER SASTRE </div>
-<div class= "competitor IRL"> 🇮🇪 Danielle HILL </div>
-<div class= "competitor FRA"> 🇫🇷 Emma TEREBO </div>
-<div class= "competitor CAN"> 🇨🇦 Ingrid WILM </div>
-<div class= "competitor AUS"> 🇦🇺 Iona ANDERSON </div>
-<div class= "competitor USA"> 🇺🇸 Katharine BERKOFF </div>
-<div class= "competitor AUS"> 🇦🇺 Kaylee McKEOWN </div>
-<div class= "competitor NED"> 🇳🇱 Kira TOUSSAINT </div>
-<div class= "competitor CAN"> 🇨🇦 Kylie MASSE </div>
-<div class= "competitor SWE"> 🇸🇪 Louise HANSSON </div>
-<div class= "competitor NED"> 🇳🇱 Maaike de WAARD </div>
-<div class= "competitor USA"> 🇺🇸 Regan SMITH </div>
-<div class= "competitor BEL"> 🇧🇪 Roos VANOTTERDIJK </div>
-<div class= "competitor CHN"> 🇨🇳 WAN Letian </div>
-<div class= "competitor CHN"> 🇨🇳 WANG Xueer </div>
    </div>
  </div>
 </div>
@@ -21807,7 +21221,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240730T175500Z" data-end="20240730T180800Z" data-noc="">
+<div class="event py-4" data-start="20240730T175500Z" data-end="20240730T180800Z" data-noc="CAN">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -21816,6 +21230,7 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div class="">Men's Individual 1/16 Elimination Round
+<div class= "competitor CAN"> 🇨🇦 Eric PETERS </div>
    </div>
  </div>
 </div>
@@ -23512,7 +22927,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240731T090000Z" data-end="20240731T092100Z" data-noc="SGP,ARG,IRL,SWE,JPN,DEN,CZE,EST,ITA,USA,USA,CHN,AUS,AUS,LTU,ESP,RSA,RSA,CAN,CAN,NED,SUI">
+<div class="event py-4" data-start="20240731T090000Z" data-end="20240731T092100Z" data-noc="ARG,AUS,CAN,CHN,CZE,DEN,ESP,EST,IRL,ITA,JPN,LTU,NED,RSA,SGP,SUI,SWE,USA">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -23521,28 +22936,6 @@
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
    <div class="">Women's 200m Breaststroke - Heats
-<div class= "competitor AUS"> 🇦🇺 Ella RAMSAY </div>
-<div class= "competitor SGP"> 🇸🇬 En Yi Letitia SIM </div>
-<div class= "competitor EST"> 🇪🇪 Eneli JEFIMOVA </div>
-<div class= "competitor ITA"> 🇮🇹 Francesca FANGIO </div>
-<div class= "competitor AUS"> 🇦🇺 Jenna STRAUCH </div>
-<div class= "competitor ESP"> 🇪🇸 Jessica VALL MONTERO </div>
-<div class= "competitor USA"> 🇺🇸 Kate DOUGLASS </div>
-<div class= "competitor RSA"> 🇿🇦 Kaylene CORBETT </div>
-<div class= "competitor CAN"> 🇨🇦 Kelsey WOG </div>
-<div class= "competitor LTU"> 🇱🇹 Kotryna TETEREVKOVA </div>
-<div class= "competitor CZE"> 🇨🇿 Kristyna HORSKA </div>
-<div class= "competitor USA"> 🇺🇸 Lilly KING </div>
-<div class= "competitor SUI"> 🇨🇭 Lisa MAMIE </div>
-<div class= "competitor ARG"> 🇦🇷 Macarena CEBALLOS </div>
-<div class= "competitor IRL"> 🇮🇪 Mona Mc SHARRY </div>
-<div class= "competitor JPN"> 🇯🇵 SUZUKI Satomi </div>
-<div class= "competitor SWE"> 🇸🇪 Sophie HANSSON </div>
-<div class= "competitor CAN"> 🇨🇦 Sydney PICKREM </div>
-<div class= "competitor RSA"> 🇿🇦 Tatjana SMITH </div>
-<div class= "competitor NED"> 🇳🇱 Tes SCHOUTEN </div>
-<div class= "competitor DEN"> 🇩🇰 Thea BLOMSTERBERG </div>
-<div class= "competitor CHN"> 🇨🇳 YE Shiwen </div>
    </div>
  </div>
 </div>
@@ -23713,7 +23106,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240731T092100Z" data-end="20240731T094600Z" data-noc="PUR,UKR,SUD,POL,JPN,ISR,KOR,GBR,GBR,HUN,GER,FRA,FRA,HUN,ITA,ITA,ZIM,USA,USA,NZL,CHN,AUS,AUS,GRE,GRE,ESP,RSA,CAN,NED,SUI">
+<div class="event py-4" data-start="20240731T092100Z" data-end="20240731T094600Z" data-noc="AUS,CAN,CHN,ESP,FRA,GBR,GER,GRE,HUN,ISR,ITA,JPN,KOR,NED,NZL,POL,PUR,RSA,SUD,SUI,UKR,USA,ZIM">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -23722,36 +23115,6 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div class="">Men's 200m Backstroke - Heats
-<div class= "competitor HUN"> 🇭🇺 Adam TELEGDY </div>
-<div class= "competitor GRE"> 🇬🇷 Apostolos CHRISTOU </div>
-<div class= "competitor GRE"> 🇬🇷 Apostolos SISKOS </div>
-<div class= "competitor CAN"> 🇨🇦 Blake TIERNEY </div>
-<div class= "competitor AUS"> 🇦🇺 Bradley WOODWARD </div>
-<div class= "competitor ISR"> 🇮🇱 David GERCHIK </div>
-<div class= "competitor ZIM"> 🇿🇼 Denilson CYPRIANOS </div>
-<div class= "competitor HUN"> 🇭🇺 Hubert KOS </div>
-<div class= "competitor ESP"> 🇪🇸 Hugo GONZALEZ de OLIVEIRA </div>
-<div class= "competitor NED"> 🇳🇱 Kai van WESTERING </div>
-<div class= "competitor NZL"> 🇳🇿 Kane FOLLOWS </div>
-<div class= "competitor USA"> 🇺🇸 Keaton JONES </div>
-<div class= "competitor POL"> 🇵🇱 Ksawery MASIUK </div>
-<div class= "competitor KOR"> 🇰🇷 LEE Juho </div>
-<div class= "competitor GER"> 🇩🇪 Lukas MAERTENS </div>
-<div class= "competitor GBR"> 🇬🇧 Luke GREENBANK </div>
-<div class= "competitor ITA"> 🇮🇹 Matteo RESTIVO </div>
-<div class= "competitor FRA"> 🇫🇷 Mewen TOMAC </div>
-<div class= "competitor UKR"> 🇺🇦 Oleksandr ZHELTIAKOV </div>
-<div class= "competitor GBR"> 🇬🇧 Oliver MORGAN </div>
-<div class= "competitor RSA"> 🇿🇦 Pieter COETZE </div>
-<div class= "competitor SUI"> 🇨🇭 Roman MITYUKOV </div>
-<div class= "competitor USA"> 🇺🇸 Ryan MURPHY </div>
-<div class= "competitor AUS"> 🇦🇺 Se-Bom LEE </div>
-<div class= "competitor JPN"> 🇯🇵 TAKEHARA Hidekazu </div>
-<div class= "competitor ITA"> 🇮🇹 Thomas CECCON </div>
-<div class= "competitor CHN"> 🇨🇳 XU Jiayu </div>
-<div class= "competitor PUR"> 🇵🇷 Yeziel MORALES </div>
-<div class= "competitor FRA"> 🇫🇷 Yohann NDOYE-BROUARD </div>
-<div class= "competitor SUD"> 🇸🇩 Ziyad SALEEM </div>
    </div>
  </div>
 </div>
@@ -23903,7 +23266,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240731T094600Z" data-end="20240731T100600Z" data-noc="CRC,JPN,JPN,DEN,GBR,GBR,HUN,ANG,USA,USA,BIH,CHN,CHN,AUS,AUS,SRB,GRE,ESP,CAN">
+<div class="event py-4" data-start="20240731T094600Z" data-end="20240731T100600Z" data-noc="ANG,AUS,BIH,CAN,CHN,CRC,DEN,ESP,GBR,GRE,HUN,JPN,SRB,USA">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -23912,25 +23275,7 @@
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
    <div class="">Women's 200m Butterfly - Heats
-<div class= "competitor AUS"> 🇦🇺 Abbey Lee CONNOR </div>
-<div class= "competitor USA"> 🇺🇸 Alex SHACKELL </div>
-<div class= "competitor CRC"> 🇨🇷 Alondra ORTIZ </div>
-<div class= "competitor SRB"> 🇷🇸 Anja CREVAR </div>
-<div class= "competitor HUN"> 🇭🇺 Boglarka KAPAS </div>
-<div class= "competitor CHN"> 🇨🇳 CHEN Luying </div>
-<div class= "competitor AUS"> 🇦🇺 Elizabeth DEKKERS </div>
-<div class= "competitor GRE"> 🇬🇷 Georgia DAMASIOTI </div>
-<div class= "competitor DEN"> 🇩🇰 Helena Rosendahl BACH </div>
-<div class= "competitor GBR"> 🇬🇧 Keanna Louise MACINNES </div>
-<div class= "competitor BIH"> 🇧🇦 Lana PUDAR </div>
-<div class= "competitor ESP"> 🇪🇸 Laura CABANES GARZAS </div>
-<div class= "competitor GBR"> 🇬🇧 Laura STEPHENS </div>
-<div class= "competitor ANG"> 🇦🇴 Lia LIMA </div>
-<div class= "competitor JPN"> 🇯🇵 MAKINO Hiroko </div>
-<div class= "competitor JPN"> 🇯🇵 MITSUI Airi </div>
-<div class= "competitor USA"> 🇺🇸 Regan SMITH </div>
-<div class= "competitor CAN"> 🇨🇦 Summer McINTOSH </div>
-<div class= "competitor CHN"> 🇨🇳 ZHANG Yufei </div>
+<div class= "competitor BIH"> 🇧🇦 Bosnia & Herzegovina </div>
    </div>
  </div>
 </div>
@@ -24203,6 +23548,78 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240731T101300Z" data-end="20240731T111300Z" data-noc="ARG,AUT,CHN,CRO,CYP,CZE,ESP,EST,FRA,GBR,GER,HKG,ISR,ITA,MEX,NED,NOR,NZL,PER,POL,SLO,SWE,TUR,USA">
+ <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">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   SAILING
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
+   </div>
+   <div class="">Women's Windsurfing - Race 8
+<div class= "competitor ARG"> 🇦🇷 Chiara FERRETTI </div>
+<div class= "competitor USA"> 🇺🇸 Dominique STATER </div>
+<div class= "competitor GBR"> 🇬🇧 Emma WILSON </div>
+<div class= "competitor FRA"> 🇫🇷 Helene NOESMOEN </div>
+<div class= "competitor EST"> 🇪🇪 Ingrid PUUSTA </div>
+<div class= "competitor SWE"> 🇸🇪 Johanna HJERTBERG </div>
+<div class= "competitor CZE"> 🇨🇿 Katerina SVIKOVA </div>
+<div class= "competitor SLO"> 🇸🇮 Lina ERZEN </div>
+<div class= "competitor AUT"> 🇦🇹 Lorena ABICHT </div>
+<div class= "competitor HKG"> 🇭🇰 MA Kwan Ching </div>
+<div class= "competitor POL"> 🇵🇱 Maja DZIARNOWSKA </div>
+<div class= "competitor PER"> 🇵🇪 Maria Belen BAZO GERMAN </div>
+<div class= "competitor MEX"> 🇲🇽 Mariana AGUILAR CHAVEZ PEON </div>
+<div class= "competitor ITA"> 🇮🇹 Marta MAGGETTI </div>
+<div class= "competitor TUR"> 🇹🇷 Merve VATAN </div>
+<div class= "competitor NOR"> 🇳🇴 Mina MOBEKK </div>
+<div class= "competitor CYP"> 🇨🇾 Natasa LAPPA </div>
+<div class= "competitor CRO"> 🇭🇷 Palma CARGO </div>
+<div class= "competitor ESP"> 🇪🇸 Pilar LAMADRID TRUEBA </div>
+<div class= "competitor NED"> 🇳🇱 Sara WENNEKES </div>
+<div class= "competitor ISR"> 🇮🇱 Sharon KANTOR </div>
+<div class= "competitor GER"> 🇩🇪 Theresa Marie STEINLEIN </div>
+<div class= "competitor NZL"> 🇳🇿 Veerle TEN HAVE </div>
+<div class= "competitor CHN"> 🇨🇳 YAN Zheng </div>
+   </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240731T101300Z" data-end="20240731T111300Z" data-noc="ARG,AUT,CHN,CRO,CYP,CZE,ESP,EST,FRA,GBR,GER,HKG,ISR,ITA,MEX,NED,NOR,NZL,PER,POL,SLO,SWE,TUR,USA">
+ <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">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   SAILING
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
+   </div>
+   <div class="">Women's Windsurfing - Race 9
+<div class= "competitor ARG"> 🇦🇷 Chiara FERRETTI </div>
+<div class= "competitor USA"> 🇺🇸 Dominique STATER </div>
+<div class= "competitor GBR"> 🇬🇧 Emma WILSON </div>
+<div class= "competitor FRA"> 🇫🇷 Helene NOESMOEN </div>
+<div class= "competitor EST"> 🇪🇪 Ingrid PUUSTA </div>
+<div class= "competitor SWE"> 🇸🇪 Johanna HJERTBERG </div>
+<div class= "competitor CZE"> 🇨🇿 Katerina SVIKOVA </div>
+<div class= "competitor SLO"> 🇸🇮 Lina ERZEN </div>
+<div class= "competitor AUT"> 🇦🇹 Lorena ABICHT </div>
+<div class= "competitor HKG"> 🇭🇰 MA Kwan Ching </div>
+<div class= "competitor POL"> 🇵🇱 Maja DZIARNOWSKA </div>
+<div class= "competitor PER"> 🇵🇪 Maria Belen BAZO GERMAN </div>
+<div class= "competitor MEX"> 🇲🇽 Mariana AGUILAR CHAVEZ PEON </div>
+<div class= "competitor ITA"> 🇮🇹 Marta MAGGETTI </div>
+<div class= "competitor TUR"> 🇹🇷 Merve VATAN </div>
+<div class= "competitor NOR"> 🇳🇴 Mina MOBEKK </div>
+<div class= "competitor CYP"> 🇨🇾 Natasa LAPPA </div>
+<div class= "competitor CRO"> 🇭🇷 Palma CARGO </div>
+<div class= "competitor ESP"> 🇪🇸 Pilar LAMADRID TRUEBA </div>
+<div class= "competitor NED"> 🇳🇱 Sara WENNEKES </div>
+<div class= "competitor ISR"> 🇮🇱 Sharon KANTOR </div>
+<div class= "competitor GER"> 🇩🇪 Theresa Marie STEINLEIN </div>
+<div class= "competitor NZL"> 🇳🇿 Veerle TEN HAVE </div>
+<div class= "competitor CHN"> 🇨🇳 YAN Zheng </div>
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240731T101400Z" data-end="20240731T102100Z" data-noc="ROU,AUS,USA">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -24215,38 +23632,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240731T101500Z" data-end="20240731T105000Z" data-noc="AUS,BEL,BRA,CAN,CHN,CZE,DEN,ESP,FIN,FRA,GBR,GER,ITA,JPN,NED,NOR,NZL,POL,SWE,USA">
- <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">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   SAILING
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">Women's Skiff - Race 10
-<div class= "competitor NED"> 🇳🇱 AANHOLT/DUETZ </div>
-<div class= "competitor NZL"> 🇳🇿 ALEH/MEECH </div>
-<div class= "competitor GER"> 🇩🇪 BERGMANN/WILLE </div>
-<div class= "competitor GBR"> 🇬🇧 BLACK/TIDEY </div>
-<div class= "competitor SWE"> 🇸🇪 BOBECK/NETZLER </div>
-<div class= "competitor CZE"> 🇨🇿 BURSKA/TKADLECOVA </div>
-<div class= "competitor ESP"> 🇪🇸 ECHEGOYEN/BARCELO </div>
-<div class= "competitor CAN"> 🇨🇦 G LEWIN-L./A LEWIN-L. </div>
-<div class= "competitor ITA"> 🇮🇹 GERMANI/BERTUZZI </div>
-<div class= "competitor FIN"> 🇫🇮 GRONBLOM/HOKKA </div>
-<div class= "competitor CHN"> 🇨🇳 HU/SHAN </div>
-<div class= "competitor DEN"> 🇩🇰 J SCHMIDT/A SCHMIDT </div>
-<div class= "competitor BEL"> 🇧🇪 MAENHAUT/GEURTS </div>
-<div class= "competitor POL"> 🇵🇱 MELZACKA/JANKOWIAK </div>
-<div class= "competitor NOR"> 🇳🇴 NAESS/ROENNINGEN </div>
-<div class= "competitor AUS"> 🇦🇺 PRICE/HASELDINE </div>
-<div class= "competitor USA"> 🇺🇸 ROBLE/SHEA </div>
-<div class= "competitor BRA"> 🇧🇷 SOFFIATTI/KUNZE </div>
-<div class= "competitor FRA"> 🇫🇷 STEYAERT/PICON </div>
-<div class= "competitor JPN"> 🇯🇵 TANAKA/NAGAMATSU </div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240731T101800Z" data-end="20240731T102400Z" 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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -24410,38 +23795,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240731T110700Z" data-end="20240731T114200Z" data-noc="AUS,BEL,BRA,CAN,CHN,CZE,DEN,ESP,FIN,FRA,GBR,GER,ITA,JPN,NED,NOR,NZL,POL,SWE,USA">
- <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">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   SAILING
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">Women's Skiff - Race 11
-<div class= "competitor NED"> 🇳🇱 AANHOLT/DUETZ </div>
-<div class= "competitor NZL"> 🇳🇿 ALEH/MEECH </div>
-<div class= "competitor GER"> 🇩🇪 BERGMANN/WILLE </div>
-<div class= "competitor GBR"> 🇬🇧 BLACK/TIDEY </div>
-<div class= "competitor SWE"> 🇸🇪 BOBECK/NETZLER </div>
-<div class= "competitor CZE"> 🇨🇿 BURSKA/TKADLECOVA </div>
-<div class= "competitor ESP"> 🇪🇸 ECHEGOYEN/BARCELO </div>
-<div class= "competitor CAN"> 🇨🇦 G LEWIN-L./A LEWIN-L. </div>
-<div class= "competitor ITA"> 🇮🇹 GERMANI/BERTUZZI </div>
-<div class= "competitor FIN"> 🇫🇮 GRONBLOM/HOKKA </div>
-<div class= "competitor CHN"> 🇨🇳 HU/SHAN </div>
-<div class= "competitor DEN"> 🇩🇰 J SCHMIDT/A SCHMIDT </div>
-<div class= "competitor BEL"> 🇧🇪 MAENHAUT/GEURTS </div>
-<div class= "competitor POL"> 🇵🇱 MELZACKA/JANKOWIAK </div>
-<div class= "competitor NOR"> 🇳🇴 NAESS/ROENNINGEN </div>
-<div class= "competitor AUS"> 🇦🇺 PRICE/HASELDINE </div>
-<div class= "competitor USA"> 🇺🇸 ROBLE/SHEA </div>
-<div class= "competitor BRA"> 🇧🇷 SOFFIATTI/KUNZE </div>
-<div class= "competitor FRA"> 🇫🇷 STEYAERT/PICON </div>
-<div class= "competitor JPN"> 🇯🇵 TANAKA/NAGAMATSU </div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240731T110800Z" data-end="20240731T111900Z" data-noc="CHN,SRB">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -24580,6 +23933,78 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240731T114300Z" data-end="20240731T124300Z" data-noc="ALG,ARG,ARU,AUS,BRA,CHN,DEN,ESP,FIN,FRA,GBR,GER,GRE,HKG,ISR,ITA,JPN,LTU,NED,NZL,POL,SUI,SVK,USA">
+ <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">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   SAILING
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div class="">Men's Windsurfing - Race 7
+<div class= "competitor HKG"> 🇭🇰 CHENG Ching Yin </div>
+<div class= "competitor SUI"> 🇨🇭 Elia COLOMBO </div>
+<div class= "competitor ARU"> 🇦🇼 Ethan WESTERA </div>
+<div class= "competitor ARG"> 🇦🇷 Francisco CRUZ SAUBIDET BIRKNER </div>
+<div class= "competitor AUS"> 🇦🇺 Grae MORRIS </div>
+<div class= "competitor CHN"> 🇨🇳 HUANG Jingye </div>
+<div class= "competitor FIN"> 🇫🇮 Jakob EKLUND </div>
+<div class= "competitor DEN"> 🇩🇰 Johan SOE </div>
+<div class= "competitor NZL"> 🇳🇿 Josh ARMIT </div>
+<div class= "competitor NED"> 🇳🇱 Luuc van OPZEELAND </div>
+<div class= "competitor BRA"> 🇧🇷 Mateus ISAAC </div>
+<div class= "competitor ESP"> 🇪🇸 Nacho BALTASAR SUMMERS </div>
+<div class= "competitor FRA"> 🇫🇷 Nicolas GOYARD </div>
+<div class= "competitor ITA"> 🇮🇹 Nicolo RENNA </div>
+<div class= "competitor USA"> 🇺🇸 Noah LYONS </div>
+<div class= "competitor POL"> 🇵🇱 Pawel TARNOWSKI </div>
+<div class= "competitor ALG"> 🇩🇿 Rami BOUDROUMA </div>
+<div class= "competitor SVK"> 🇸🇰 Robert KUBIN </div>
+<div class= "competitor LTU"> 🇱🇹 Rytis JASIUNAS </div>
+<div class= "competitor GBR"> 🇬🇧 Sam SILLS </div>
+<div class= "competitor GER"> 🇩🇪 Sebastian KOERDEL </div>
+<div class= "competitor JPN"> 🇯🇵 TOMIZAWA Makoto </div>
+<div class= "competitor ISR"> 🇮🇱 Tom REUVENY </div>
+<div class= "competitor GRE"> 🇬🇷 Vyron KOKKALANIS </div>
+   </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240731T114300Z" data-end="20240731T124300Z" data-noc="ALG,ARG,ARU,AUS,BRA,CHN,DEN,ESP,FIN,FRA,GBR,GER,GRE,HKG,ISR,ITA,JPN,LTU,NED,NZL,POL,SUI,SVK,USA">
+ <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">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   SAILING
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div class="">Men's Windsurfing - Race 8
+<div class= "competitor HKG"> 🇭🇰 CHENG Ching Yin </div>
+<div class= "competitor SUI"> 🇨🇭 Elia COLOMBO </div>
+<div class= "competitor ARU"> 🇦🇼 Ethan WESTERA </div>
+<div class= "competitor ARG"> 🇦🇷 Francisco CRUZ SAUBIDET BIRKNER </div>
+<div class= "competitor AUS"> 🇦🇺 Grae MORRIS </div>
+<div class= "competitor CHN"> 🇨🇳 HUANG Jingye </div>
+<div class= "competitor FIN"> 🇫🇮 Jakob EKLUND </div>
+<div class= "competitor DEN"> 🇩🇰 Johan SOE </div>
+<div class= "competitor NZL"> 🇳🇿 Josh ARMIT </div>
+<div class= "competitor NED"> 🇳🇱 Luuc van OPZEELAND </div>
+<div class= "competitor BRA"> 🇧🇷 Mateus ISAAC </div>
+<div class= "competitor ESP"> 🇪🇸 Nacho BALTASAR SUMMERS </div>
+<div class= "competitor FRA"> 🇫🇷 Nicolas GOYARD </div>
+<div class= "competitor ITA"> 🇮🇹 Nicolo RENNA </div>
+<div class= "competitor USA"> 🇺🇸 Noah LYONS </div>
+<div class= "competitor POL"> 🇵🇱 Pawel TARNOWSKI </div>
+<div class= "competitor ALG"> 🇩🇿 Rami BOUDROUMA </div>
+<div class= "competitor SVK"> 🇸🇰 Robert KUBIN </div>
+<div class= "competitor LTU"> 🇱🇹 Rytis JASIUNAS </div>
+<div class= "competitor GBR"> 🇬🇧 Sam SILLS </div>
+<div class= "competitor GER"> 🇩🇪 Sebastian KOERDEL </div>
+<div class= "competitor JPN"> 🇯🇵 TOMIZAWA Makoto </div>
+<div class= "competitor ISR"> 🇮🇱 Tom REUVENY </div>
+<div class= "competitor GRE"> 🇬🇷 Vyron KOKKALANIS </div>
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240731T114400Z" data-end="20240731T115700Z" data-noc="ITA,MAS">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -24606,38 +24031,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240731T115900Z" data-end="20240731T123400Z" data-noc="AUS,BEL,BRA,CAN,CHN,CZE,DEN,ESP,FIN,FRA,GBR,GER,ITA,JPN,NED,NOR,NZL,POL,SWE,USA">
- <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">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   SAILING
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">Women's Skiff - Race 12
-<div class= "competitor NED"> 🇳🇱 AANHOLT/DUETZ </div>
-<div class= "competitor NZL"> 🇳🇿 ALEH/MEECH </div>
-<div class= "competitor GER"> 🇩🇪 BERGMANN/WILLE </div>
-<div class= "competitor GBR"> 🇬🇧 BLACK/TIDEY </div>
-<div class= "competitor SWE"> 🇸🇪 BOBECK/NETZLER </div>
-<div class= "competitor CZE"> 🇨🇿 BURSKA/TKADLECOVA </div>
-<div class= "competitor ESP"> 🇪🇸 ECHEGOYEN/BARCELO </div>
-<div class= "competitor CAN"> 🇨🇦 G LEWIN-L./A LEWIN-L. </div>
-<div class= "competitor ITA"> 🇮🇹 GERMANI/BERTUZZI </div>
-<div class= "competitor FIN"> 🇫🇮 GRONBLOM/HOKKA </div>
-<div class= "competitor CHN"> 🇨🇳 HU/SHAN </div>
-<div class= "competitor DEN"> 🇩🇰 J SCHMIDT/A SCHMIDT </div>
-<div class= "competitor BEL"> 🇧🇪 MAENHAUT/GEURTS </div>
-<div class= "competitor POL"> 🇵🇱 MELZACKA/JANKOWIAK </div>
-<div class= "competitor NOR"> 🇳🇴 NAESS/ROENNINGEN </div>
-<div class= "competitor AUS"> 🇦🇺 PRICE/HASELDINE </div>
-<div class= "competitor USA"> 🇺🇸 ROBLE/SHEA </div>
-<div class= "competitor BRA"> 🇧🇷 SOFFIATTI/KUNZE </div>
-<div class= "competitor FRA"> 🇫🇷 STEYAERT/PICON </div>
-<div class= "competitor JPN"> 🇯🇵 TANAKA/NAGAMATSU </div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240731T120000Z" data-end="20240731T124000Z" data-noc="CHN,TPE">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -24703,42 +24096,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240731T120300Z" data-end="20240731T122400Z" data-noc="ALG,ARG,ARU,AUS,BRA,CHN,DEN,ESP,FIN,FRA,GBR,GER,GRE,HKG,ISR,ITA,JPN,LTU,NED,NZL,POL,SUI,SVK,USA">
- <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">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   SAILING
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div class="">Men's Windsurfing - Race 7
-<div class= "competitor HKG"> 🇭🇰 CHENG Ching Yin </div>
-<div class= "competitor SUI"> 🇨🇭 Elia COLOMBO </div>
-<div class= "competitor ARU"> 🇦🇼 Ethan WESTERA </div>
-<div class= "competitor ARG"> 🇦🇷 Francisco CRUZ SAUBIDET BIRKNER </div>
-<div class= "competitor AUS"> 🇦🇺 Grae MORRIS </div>
-<div class= "competitor CHN"> 🇨🇳 HUANG Jingye </div>
-<div class= "competitor FIN"> 🇫🇮 Jakob EKLUND </div>
-<div class= "competitor DEN"> 🇩🇰 Johan SOE </div>
-<div class= "competitor NZL"> 🇳🇿 Josh ARMIT </div>
-<div class= "competitor NED"> 🇳🇱 Luuc van OPZEELAND </div>
-<div class= "competitor BRA"> 🇧🇷 Mateus ISAAC </div>
-<div class= "competitor ESP"> 🇪🇸 Nacho BALTASAR SUMMERS </div>
-<div class= "competitor FRA"> 🇫🇷 Nicolas GOYARD </div>
-<div class= "competitor ITA"> 🇮🇹 Nicolo RENNA </div>
-<div class= "competitor USA"> 🇺🇸 Noah LYONS </div>
-<div class= "competitor POL"> 🇵🇱 Pawel TARNOWSKI </div>
-<div class= "competitor ALG"> 🇩🇿 Rami BOUDROUMA </div>
-<div class= "competitor SVK"> 🇸🇰 Robert KUBIN </div>
-<div class= "competitor LTU"> 🇱🇹 Rytis JASIUNAS </div>
-<div class= "competitor GBR"> 🇬🇧 Sam SILLS </div>
-<div class= "competitor GER"> 🇩🇪 Sebastian KOERDEL </div>
-<div class= "competitor JPN"> 🇯🇵 TOMIZAWA Makoto </div>
-<div class= "competitor ISR"> 🇮🇱 Tom REUVENY </div>
-<div class= "competitor GRE"> 🇬🇷 Vyron KOKKALANIS </div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240731T121000Z" data-end="20240731T122300Z" 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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -24751,6 +24108,38 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240731T121500Z" data-end="20240731T125000Z" data-noc="AUS,AUT,BEL,BRA,CAN,CHN,CRO,DEN,ESP,FRA,GBR,GER,HKG,IRL,NED,NZL,POL,SUI,URU,USA">
+ <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">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   SAILING
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div class="">Men's Skiff - Race 10
+<div class= "competitor CAN"> 🇨🇦 BARNES/JONES </div>
+<div class= "competitor USA"> 🇺🇸 BARROWS/HENKEN </div>
+<div class= "competitor AUT"> 🇦🇹 BILDSTEIN/HUSSL </div>
+<div class= "competitor ESP"> 🇪🇸 BOTIN/TRITTEL </div>
+<div class= "competitor POL"> 🇵🇱 BUKSAK/WIERZBICKI </div>
+<div class= "competitor AUS"> 🇦🇺 COLLEY/CONNOR </div>
+<div class= "competitor FRA"> 🇫🇷 FISCHER/PEQUIN </div>
+<div class= "competitor NED"> 🇳🇱 LAMBRIEX/WERKEN </div>
+<div class= "competitor BEL"> 🇧🇪 LEFEBVRE/HEUNINCK </div>
+<div class= "competitor GER"> 🇩🇪 MEGGENDORF/SPRANGER </div>
+<div class= "competitor NZL"> 🇳🇿 McHARDIE/McKENZIE </div>
+<div class= "competitor DEN"> 🇩🇰 NYBORG/BUHL </div>
+<div class= "competitor GBR"> 🇬🇧 PETERS/STERRITT </div>
+<div class= "competitor CRO"> 🇭🇷 S FANTELA/M FANTELA </div>
+<div class= "competitor HKG"> 🇭🇰 SAKAI/ALYSWORTH </div>
+<div class= "competitor SUI"> 🇨🇭 SCHNEITER/de PLANTA </div>
+<div class= "competitor BRA"> 🇧🇷 SOFFIATTI/SIMOES </div>
+<div class= "competitor URU"> 🇺🇾 UMPIERRE/DIZ </div>
+<div class= "competitor IRL"> 🇮🇪 WADDILOVE/DICKSON </div>
+<div class= "competitor CHN"> 🇨🇳 WEN/LIU </div>
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240731T122300Z" data-end="20240731T123600Z" 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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -24763,42 +24152,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240731T123400Z" data-end="20240731T125500Z" data-noc="ALG,ARG,ARU,AUS,BRA,CHN,DEN,ESP,FIN,FRA,GBR,GER,GRE,HKG,ISR,ITA,JPN,LTU,NED,NZL,POL,SUI,SVK,USA">
- <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">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   SAILING
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div class="">Men's Windsurfing - Race 8
-<div class= "competitor HKG"> 🇭🇰 CHENG Ching Yin </div>
-<div class= "competitor SUI"> 🇨🇭 Elia COLOMBO </div>
-<div class= "competitor ARU"> 🇦🇼 Ethan WESTERA </div>
-<div class= "competitor ARG"> 🇦🇷 Francisco CRUZ SAUBIDET BIRKNER </div>
-<div class= "competitor AUS"> 🇦🇺 Grae MORRIS </div>
-<div class= "competitor CHN"> 🇨🇳 HUANG Jingye </div>
-<div class= "competitor FIN"> 🇫🇮 Jakob EKLUND </div>
-<div class= "competitor DEN"> 🇩🇰 Johan SOE </div>
-<div class= "competitor NZL"> 🇳🇿 Josh ARMIT </div>
-<div class= "competitor NED"> 🇳🇱 Luuc van OPZEELAND </div>
-<div class= "competitor BRA"> 🇧🇷 Mateus ISAAC </div>
-<div class= "competitor ESP"> 🇪🇸 Nacho BALTASAR SUMMERS </div>
-<div class= "competitor FRA"> 🇫🇷 Nicolas GOYARD </div>
-<div class= "competitor ITA"> 🇮🇹 Nicolo RENNA </div>
-<div class= "competitor USA"> 🇺🇸 Noah LYONS </div>
-<div class= "competitor POL"> 🇵🇱 Pawel TARNOWSKI </div>
-<div class= "competitor ALG"> 🇩🇿 Rami BOUDROUMA </div>
-<div class= "competitor SVK"> 🇸🇰 Robert KUBIN </div>
-<div class= "competitor LTU"> 🇱🇹 Rytis JASIUNAS </div>
-<div class= "competitor GBR"> 🇬🇧 Sam SILLS </div>
-<div class= "competitor GER"> 🇩🇪 Sebastian KOERDEL </div>
-<div class= "competitor JPN"> 🇯🇵 TOMIZAWA Makoto </div>
-<div class= "competitor ISR"> 🇮🇱 Tom REUVENY </div>
-<div class= "competitor GRE"> 🇬🇷 Vyron KOKKALANIS </div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240731T123600Z" data-end="20240731T124900Z" data-noc="KOR,AUS">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -24885,38 +24238,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240731T125000Z" data-end="20240731T132500Z" data-noc="AUS,AUT,BEL,BRA,CAN,CHN,CRO,DEN,ESP,FRA,GBR,GER,HKG,IRL,NED,NZL,POL,SUI,URU,USA">
- <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">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   SAILING
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div class="">Men's Skiff - Race 10
-<div class= "competitor CAN"> 🇨🇦 BARNES/JONES </div>
-<div class= "competitor USA"> 🇺🇸 BARROWS/HENKEN </div>
-<div class= "competitor AUT"> 🇦🇹 BILDSTEIN/HUSSL </div>
-<div class= "competitor ESP"> 🇪🇸 BOTIN/TRITTEL </div>
-<div class= "competitor POL"> 🇵🇱 BUKSAK/WIERZBICKI </div>
-<div class= "competitor AUS"> 🇦🇺 COLLEY/CONNOR </div>
-<div class= "competitor FRA"> 🇫🇷 FISCHER/PEQUIN </div>
-<div class= "competitor NED"> 🇳🇱 LAMBRIEX/WERKEN </div>
-<div class= "competitor BEL"> 🇧🇪 LEFEBVRE/HEUNINCK </div>
-<div class= "competitor GER"> 🇩🇪 MEGGENDORF/SPRANGER </div>
-<div class= "competitor NZL"> 🇳🇿 McHARDIE/McKENZIE </div>
-<div class= "competitor DEN"> 🇩🇰 NYBORG/BUHL </div>
-<div class= "competitor GBR"> 🇬🇧 PETERS/STERRITT </div>
-<div class= "competitor CRO"> 🇭🇷 S FANTELA/M FANTELA </div>
-<div class= "competitor HKG"> 🇭🇰 SAKAI/ALYSWORTH </div>
-<div class= "competitor SUI"> 🇨🇭 SCHNEITER/de PLANTA </div>
-<div class= "competitor BRA"> 🇧🇷 SOFFIATTI/SIMOES </div>
-<div class= "competitor URU"> 🇺🇾 UMPIERRE/DIZ </div>
-<div class= "competitor IRL"> 🇮🇪 WADDILOVE/DICKSON </div>
-<div class= "competitor CHN"> 🇨🇳 WEN/LIU </div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240731T130000Z" data-end="20240731T135000Z" data-noc="USA,FRA">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -25019,7 +24340,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240731T130500Z" data-end="20240731T132600Z" data-noc="ALG,ARG,ARU,AUS,BRA,CHN,DEN,ESP,FIN,FRA,GBR,GER,GRE,HKG,ISR,ITA,JPN,LTU,NED,NZL,POL,SUI,SVK,USA">
+<div class="event py-4" data-start="20240731T130700Z" data-end="20240731T134200Z" data-noc="AUS,AUT,BEL,BRA,CAN,CHN,CRO,DEN,ESP,FRA,GBR,GER,HKG,IRL,NED,NZL,POL,SUI,URU,USA">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -25027,31 +24348,63 @@
    SAILING
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
-   <div class="">Men's Windsurfing - Race 9
-<div class= "competitor HKG"> 🇭🇰 CHENG Ching Yin </div>
-<div class= "competitor SUI"> 🇨🇭 Elia COLOMBO </div>
-<div class= "competitor ARU"> 🇦🇼 Ethan WESTERA </div>
-<div class= "competitor ARG"> 🇦🇷 Francisco CRUZ SAUBIDET BIRKNER </div>
-<div class= "competitor AUS"> 🇦🇺 Grae MORRIS </div>
-<div class= "competitor CHN"> 🇨🇳 HUANG Jingye </div>
-<div class= "competitor FIN"> 🇫🇮 Jakob EKLUND </div>
-<div class= "competitor DEN"> 🇩🇰 Johan SOE </div>
-<div class= "competitor NZL"> 🇳🇿 Josh ARMIT </div>
-<div class= "competitor NED"> 🇳🇱 Luuc van OPZEELAND </div>
-<div class= "competitor BRA"> 🇧🇷 Mateus ISAAC </div>
-<div class= "competitor ESP"> 🇪🇸 Nacho BALTASAR SUMMERS </div>
-<div class= "competitor FRA"> 🇫🇷 Nicolas GOYARD </div>
-<div class= "competitor ITA"> 🇮🇹 Nicolo RENNA </div>
-<div class= "competitor USA"> 🇺🇸 Noah LYONS </div>
-<div class= "competitor POL"> 🇵🇱 Pawel TARNOWSKI </div>
-<div class= "competitor ALG"> 🇩🇿 Rami BOUDROUMA </div>
-<div class= "competitor SVK"> 🇸🇰 Robert KUBIN </div>
-<div class= "competitor LTU"> 🇱🇹 Rytis JASIUNAS </div>
-<div class= "competitor GBR"> 🇬🇧 Sam SILLS </div>
-<div class= "competitor GER"> 🇩🇪 Sebastian KOERDEL </div>
-<div class= "competitor JPN"> 🇯🇵 TOMIZAWA Makoto </div>
-<div class= "competitor ISR"> 🇮🇱 Tom REUVENY </div>
-<div class= "competitor GRE"> 🇬🇷 Vyron KOKKALANIS </div>
+   <div class="">Men's Skiff - Race 11
+<div class= "competitor CAN"> 🇨🇦 BARNES/JONES </div>
+<div class= "competitor USA"> 🇺🇸 BARROWS/HENKEN </div>
+<div class= "competitor AUT"> 🇦🇹 BILDSTEIN/HUSSL </div>
+<div class= "competitor ESP"> 🇪🇸 BOTIN/TRITTEL </div>
+<div class= "competitor POL"> 🇵🇱 BUKSAK/WIERZBICKI </div>
+<div class= "competitor AUS"> 🇦🇺 COLLEY/CONNOR </div>
+<div class= "competitor FRA"> 🇫🇷 FISCHER/PEQUIN </div>
+<div class= "competitor NED"> 🇳🇱 LAMBRIEX/WERKEN </div>
+<div class= "competitor BEL"> 🇧🇪 LEFEBVRE/HEUNINCK </div>
+<div class= "competitor GER"> 🇩🇪 MEGGENDORF/SPRANGER </div>
+<div class= "competitor NZL"> 🇳🇿 McHARDIE/McKENZIE </div>
+<div class= "competitor DEN"> 🇩🇰 NYBORG/BUHL </div>
+<div class= "competitor GBR"> 🇬🇧 PETERS/STERRITT </div>
+<div class= "competitor CRO"> 🇭🇷 S FANTELA/M FANTELA </div>
+<div class= "competitor HKG"> 🇭🇰 SAKAI/ALYSWORTH </div>
+<div class= "competitor SUI"> 🇨🇭 SCHNEITER/de PLANTA </div>
+<div class= "competitor BRA"> 🇧🇷 SOFFIATTI/SIMOES </div>
+<div class= "competitor URU"> 🇺🇾 UMPIERRE/DIZ </div>
+<div class= "competitor IRL"> 🇮🇪 WADDILOVE/DICKSON </div>
+<div class= "competitor CHN"> 🇨🇳 WEN/LIU </div>
+   </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240731T131300Z" data-end="20240731T133400Z" data-noc="ARG,AUT,CHN,CRO,CYP,CZE,ESP,EST,FRA,GBR,GER,HKG,ISR,ITA,MEX,NED,NOR,NZL,PER,POL,SLO,SWE,TUR,USA">
+ <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">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   SAILING
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
+   </div>
+   <div class="">Women's Windsurfing - Race 10
+<div class= "competitor ARG"> 🇦🇷 Chiara FERRETTI </div>
+<div class= "competitor USA"> 🇺🇸 Dominique STATER </div>
+<div class= "competitor GBR"> 🇬🇧 Emma WILSON </div>
+<div class= "competitor FRA"> 🇫🇷 Helene NOESMOEN </div>
+<div class= "competitor EST"> 🇪🇪 Ingrid PUUSTA </div>
+<div class= "competitor SWE"> 🇸🇪 Johanna HJERTBERG </div>
+<div class= "competitor CZE"> 🇨🇿 Katerina SVIKOVA </div>
+<div class= "competitor SLO"> 🇸🇮 Lina ERZEN </div>
+<div class= "competitor AUT"> 🇦🇹 Lorena ABICHT </div>
+<div class= "competitor HKG"> 🇭🇰 MA Kwan Ching </div>
+<div class= "competitor POL"> 🇵🇱 Maja DZIARNOWSKA </div>
+<div class= "competitor PER"> 🇵🇪 Maria Belen BAZO GERMAN </div>
+<div class= "competitor MEX"> 🇲🇽 Mariana AGUILAR CHAVEZ PEON </div>
+<div class= "competitor ITA"> 🇮🇹 Marta MAGGETTI </div>
+<div class= "competitor TUR"> 🇹🇷 Merve VATAN </div>
+<div class= "competitor NOR"> 🇳🇴 Mina MOBEKK </div>
+<div class= "competitor CYP"> 🇨🇾 Natasa LAPPA </div>
+<div class= "competitor CRO"> 🇭🇷 Palma CARGO </div>
+<div class= "competitor ESP"> 🇪🇸 Pilar LAMADRID TRUEBA </div>
+<div class= "competitor NED"> 🇳🇱 Sara WENNEKES </div>
+<div class= "competitor ISR"> 🇮🇱 Sharon KANTOR </div>
+<div class= "competitor GER"> 🇩🇪 Theresa Marie STEINLEIN </div>
+<div class= "competitor NZL"> 🇳🇿 Veerle TEN HAVE </div>
+<div class= "competitor CHN"> 🇨🇳 YAN Zheng </div>
    </div>
  </div>
 </div>
@@ -25068,6 +24421,38 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240731T131500Z" data-end="20240731T135000Z" data-noc="AUS,BEL,BRA,CAN,CHN,CZE,DEN,ESP,FIN,FRA,GBR,GER,ITA,JPN,NED,NOR,NZL,POL,SWE,USA">
+ <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">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   SAILING
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
+   </div>
+   <div class="">Women's Skiff - Race 10
+<div class= "competitor NED"> 🇳🇱 AANHOLT/DUETZ </div>
+<div class= "competitor NZL"> 🇳🇿 ALEH/MEECH </div>
+<div class= "competitor GER"> 🇩🇪 BERGMANN/WILLE </div>
+<div class= "competitor GBR"> 🇬🇧 BLACK/TIDEY </div>
+<div class= "competitor SWE"> 🇸🇪 BOBECK/NETZLER </div>
+<div class= "competitor CZE"> 🇨🇿 BURSKA/TKADLECOVA </div>
+<div class= "competitor ESP"> 🇪🇸 ECHEGOYEN/BARCELO </div>
+<div class= "competitor CAN"> 🇨🇦 G LEWIN-L./A LEWIN-L. </div>
+<div class= "competitor ITA"> 🇮🇹 GERMANI/BERTUZZI </div>
+<div class= "competitor FIN"> 🇫🇮 GRONBLOM/HOKKA </div>
+<div class= "competitor CHN"> 🇨🇳 HU/SHAN </div>
+<div class= "competitor DEN"> 🇩🇰 J SCHMIDT/A SCHMIDT </div>
+<div class= "competitor BEL"> 🇧🇪 MAENHAUT/GEURTS </div>
+<div class= "competitor POL"> 🇵🇱 MELZACKA/JANKOWIAK </div>
+<div class= "competitor NOR"> 🇳🇴 NAESS/ROENNINGEN </div>
+<div class= "competitor AUS"> 🇦🇺 PRICE/HASELDINE </div>
+<div class= "competitor USA"> 🇺🇸 ROBLE/SHEA </div>
+<div class= "competitor BRA"> 🇧🇷 SOFFIATTI/KUNZE </div>
+<div class= "competitor FRA"> 🇫🇷 STEYAERT/PICON </div>
+<div class= "competitor JPN"> 🇯🇵 TANAKA/NAGAMATSU </div>
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240731T132800Z" data-end="20240731T134100Z" 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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -25148,42 +24533,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240731T133600Z" data-end="20240731T135700Z" data-noc="ALG,ARG,ARU,AUS,BRA,CHN,DEN,ESP,FIN,FRA,GBR,GER,GRE,HKG,ISR,ITA,JPN,LTU,NED,NZL,POL,SUI,SVK,USA">
- <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">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   SAILING
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div class="">Men's Windsurfing - Race 10
-<div class= "competitor HKG"> 🇭🇰 CHENG Ching Yin </div>
-<div class= "competitor SUI"> 🇨🇭 Elia COLOMBO </div>
-<div class= "competitor ARU"> 🇦🇼 Ethan WESTERA </div>
-<div class= "competitor ARG"> 🇦🇷 Francisco CRUZ SAUBIDET BIRKNER </div>
-<div class= "competitor AUS"> 🇦🇺 Grae MORRIS </div>
-<div class= "competitor CHN"> 🇨🇳 HUANG Jingye </div>
-<div class= "competitor FIN"> 🇫🇮 Jakob EKLUND </div>
-<div class= "competitor DEN"> 🇩🇰 Johan SOE </div>
-<div class= "competitor NZL"> 🇳🇿 Josh ARMIT </div>
-<div class= "competitor NED"> 🇳🇱 Luuc van OPZEELAND </div>
-<div class= "competitor BRA"> 🇧🇷 Mateus ISAAC </div>
-<div class= "competitor ESP"> 🇪🇸 Nacho BALTASAR SUMMERS </div>
-<div class= "competitor FRA"> 🇫🇷 Nicolas GOYARD </div>
-<div class= "competitor ITA"> 🇮🇹 Nicolo RENNA </div>
-<div class= "competitor USA"> 🇺🇸 Noah LYONS </div>
-<div class= "competitor POL"> 🇵🇱 Pawel TARNOWSKI </div>
-<div class= "competitor ALG"> 🇩🇿 Rami BOUDROUMA </div>
-<div class= "competitor SVK"> 🇸🇰 Robert KUBIN </div>
-<div class= "competitor LTU"> 🇱🇹 Rytis JASIUNAS </div>
-<div class= "competitor GBR"> 🇬🇧 Sam SILLS </div>
-<div class= "competitor GER"> 🇩🇪 Sebastian KOERDEL </div>
-<div class= "competitor JPN"> 🇯🇵 TOMIZAWA Makoto </div>
-<div class= "competitor ISR"> 🇮🇱 Tom REUVENY </div>
-<div class= "competitor GRE"> 🇬🇷 Vyron KOKKALANIS </div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240731T134000Z" data-end="20240731T142000Z" data-noc="TPE,HKG">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -25235,35 +24584,39 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240731T134500Z" data-end="20240731T142000Z" data-noc="AUS,AUT,BEL,BRA,CAN,CHN,CRO,DEN,ESP,FRA,GBR,GER,HKG,IRL,NED,NZL,POL,SUI,URU,USA">
+<div class="event py-4" data-start="20240731T134400Z" data-end="20240731T140500Z" data-noc="ARG,AUT,CHN,CRO,CYP,CZE,ESP,EST,FRA,GBR,GER,HKG,ISR,ITA,MEX,NED,NOR,NZL,PER,POL,SLO,SWE,TUR,USA">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
    
    SAILING
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
-   <div class="">Men's Skiff - Race 11
-<div class= "competitor CAN"> 🇨🇦 BARNES/JONES </div>
-<div class= "competitor USA"> 🇺🇸 BARROWS/HENKEN </div>
-<div class= "competitor AUT"> 🇦🇹 BILDSTEIN/HUSSL </div>
-<div class= "competitor ESP"> 🇪🇸 BOTIN/TRITTEL </div>
-<div class= "competitor POL"> 🇵🇱 BUKSAK/WIERZBICKI </div>
-<div class= "competitor AUS"> 🇦🇺 COLLEY/CONNOR </div>
-<div class= "competitor FRA"> 🇫🇷 FISCHER/PEQUIN </div>
-<div class= "competitor NED"> 🇳🇱 LAMBRIEX/WERKEN </div>
-<div class= "competitor BEL"> 🇧🇪 LEFEBVRE/HEUNINCK </div>
-<div class= "competitor GER"> 🇩🇪 MEGGENDORF/SPRANGER </div>
-<div class= "competitor NZL"> 🇳🇿 McHARDIE/McKENZIE </div>
-<div class= "competitor DEN"> 🇩🇰 NYBORG/BUHL </div>
-<div class= "competitor GBR"> 🇬🇧 PETERS/STERRITT </div>
-<div class= "competitor CRO"> 🇭🇷 S FANTELA/M FANTELA </div>
-<div class= "competitor HKG"> 🇭🇰 SAKAI/ALYSWORTH </div>
-<div class= "competitor SUI"> 🇨🇭 SCHNEITER/de PLANTA </div>
-<div class= "competitor BRA"> 🇧🇷 SOFFIATTI/SIMOES </div>
-<div class= "competitor URU"> 🇺🇾 UMPIERRE/DIZ </div>
-<div class= "competitor IRL"> 🇮🇪 WADDILOVE/DICKSON </div>
-<div class= "competitor CHN"> 🇨🇳 WEN/LIU </div>
+   <div class="">Women's Windsurfing - Race 11
+<div class= "competitor ARG"> 🇦🇷 Chiara FERRETTI </div>
+<div class= "competitor USA"> 🇺🇸 Dominique STATER </div>
+<div class= "competitor GBR"> 🇬🇧 Emma WILSON </div>
+<div class= "competitor FRA"> 🇫🇷 Helene NOESMOEN </div>
+<div class= "competitor EST"> 🇪🇪 Ingrid PUUSTA </div>
+<div class= "competitor SWE"> 🇸🇪 Johanna HJERTBERG </div>
+<div class= "competitor CZE"> 🇨🇿 Katerina SVIKOVA </div>
+<div class= "competitor SLO"> 🇸🇮 Lina ERZEN </div>
+<div class= "competitor AUT"> 🇦🇹 Lorena ABICHT </div>
+<div class= "competitor HKG"> 🇭🇰 MA Kwan Ching </div>
+<div class= "competitor POL"> 🇵🇱 Maja DZIARNOWSKA </div>
+<div class= "competitor PER"> 🇵🇪 Maria Belen BAZO GERMAN </div>
+<div class= "competitor MEX"> 🇲🇽 Mariana AGUILAR CHAVEZ PEON </div>
+<div class= "competitor ITA"> 🇮🇹 Marta MAGGETTI </div>
+<div class= "competitor TUR"> 🇹🇷 Merve VATAN </div>
+<div class= "competitor NOR"> 🇳🇴 Mina MOBEKK </div>
+<div class= "competitor CYP"> 🇨🇾 Natasa LAPPA </div>
+<div class= "competitor CRO"> 🇭🇷 Palma CARGO </div>
+<div class= "competitor ESP"> 🇪🇸 Pilar LAMADRID TRUEBA </div>
+<div class= "competitor NED"> 🇳🇱 Sara WENNEKES </div>
+<div class= "competitor ISR"> 🇮🇱 Sharon KANTOR </div>
+<div class= "competitor GER"> 🇩🇪 Theresa Marie STEINLEIN </div>
+<div class= "competitor NZL"> 🇳🇿 Veerle TEN HAVE </div>
+<div class= "competitor CHN"> 🇨🇳 YAN Zheng </div>
    </div>
  </div>
 </div>
@@ -25304,6 +24657,70 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240731T135500Z" data-end="20240731T143000Z" data-noc="AUS,BEL,BRA,CAN,CHN,CZE,DEN,ESP,FIN,FRA,GBR,GER,ITA,JPN,NED,NOR,NZL,POL,SWE,USA">
+ <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">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   SAILING
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
+   </div>
+   <div class="">Women's Skiff - Race 11
+<div class= "competitor NED"> 🇳🇱 AANHOLT/DUETZ </div>
+<div class= "competitor NZL"> 🇳🇿 ALEH/MEECH </div>
+<div class= "competitor GER"> 🇩🇪 BERGMANN/WILLE </div>
+<div class= "competitor GBR"> 🇬🇧 BLACK/TIDEY </div>
+<div class= "competitor SWE"> 🇸🇪 BOBECK/NETZLER </div>
+<div class= "competitor CZE"> 🇨🇿 BURSKA/TKADLECOVA </div>
+<div class= "competitor ESP"> 🇪🇸 ECHEGOYEN/BARCELO </div>
+<div class= "competitor CAN"> 🇨🇦 G LEWIN-L./A LEWIN-L. </div>
+<div class= "competitor ITA"> 🇮🇹 GERMANI/BERTUZZI </div>
+<div class= "competitor FIN"> 🇫🇮 GRONBLOM/HOKKA </div>
+<div class= "competitor CHN"> 🇨🇳 HU/SHAN </div>
+<div class= "competitor DEN"> 🇩🇰 J SCHMIDT/A SCHMIDT </div>
+<div class= "competitor BEL"> 🇧🇪 MAENHAUT/GEURTS </div>
+<div class= "competitor POL"> 🇵🇱 MELZACKA/JANKOWIAK </div>
+<div class= "competitor NOR"> 🇳🇴 NAESS/ROENNINGEN </div>
+<div class= "competitor AUS"> 🇦🇺 PRICE/HASELDINE </div>
+<div class= "competitor USA"> 🇺🇸 ROBLE/SHEA </div>
+<div class= "competitor BRA"> 🇧🇷 SOFFIATTI/KUNZE </div>
+<div class= "competitor FRA"> 🇫🇷 STEYAERT/PICON </div>
+<div class= "competitor JPN"> 🇯🇵 TANAKA/NAGAMATSU </div>
+   </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240731T135900Z" data-end="20240731T143400Z" data-noc="AUS,AUT,BEL,BRA,CAN,CHN,CRO,DEN,ESP,FRA,GBR,GER,HKG,IRL,NED,NZL,POL,SUI,URU,USA">
+ <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">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   SAILING
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div class="">Men's Skiff - Race 12
+<div class= "competitor CAN"> 🇨🇦 BARNES/JONES </div>
+<div class= "competitor USA"> 🇺🇸 BARROWS/HENKEN </div>
+<div class= "competitor AUT"> 🇦🇹 BILDSTEIN/HUSSL </div>
+<div class= "competitor ESP"> 🇪🇸 BOTIN/TRITTEL </div>
+<div class= "competitor POL"> 🇵🇱 BUKSAK/WIERZBICKI </div>
+<div class= "competitor AUS"> 🇦🇺 COLLEY/CONNOR </div>
+<div class= "competitor FRA"> 🇫🇷 FISCHER/PEQUIN </div>
+<div class= "competitor NED"> 🇳🇱 LAMBRIEX/WERKEN </div>
+<div class= "competitor BEL"> 🇧🇪 LEFEBVRE/HEUNINCK </div>
+<div class= "competitor GER"> 🇩🇪 MEGGENDORF/SPRANGER </div>
+<div class= "competitor NZL"> 🇳🇿 McHARDIE/McKENZIE </div>
+<div class= "competitor DEN"> 🇩🇰 NYBORG/BUHL </div>
+<div class= "competitor GBR"> 🇬🇧 PETERS/STERRITT </div>
+<div class= "competitor CRO"> 🇭🇷 S FANTELA/M FANTELA </div>
+<div class= "competitor HKG"> 🇭🇰 SAKAI/ALYSWORTH </div>
+<div class= "competitor SUI"> 🇨🇭 SCHNEITER/de PLANTA </div>
+<div class= "competitor BRA"> 🇧🇷 SOFFIATTI/SIMOES </div>
+<div class= "competitor URU"> 🇺🇾 UMPIERRE/DIZ </div>
+<div class= "competitor IRL"> 🇮🇪 WADDILOVE/DICKSON </div>
+<div class= "competitor CHN"> 🇨🇳 WEN/LIU </div>
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240731T140000Z" data-end="20240731T145000Z" data-noc="NED,CHI">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -25419,7 +24836,19 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240731T140700Z" data-end="20240731T142800Z" data-noc="ALG,ARG,ARU,AUS,BRA,CHN,DEN,ESP,FIN,FRA,GBR,GER,GRE,HKG,ISR,ITA,JPN,LTU,NED,NZL,POL,SUI,SVK,USA">
+<div class="event py-4" data-start="20240731T141200Z" data-end="20240731T141800Z" 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">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   JUDO
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
+   </div>
+   <div class="">Women -70 kg Semifinal of Table B
+   </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240731T141500Z" data-end="20240731T143600Z" data-noc="ALG,ARG,ARU,AUS,BRA,CHN,DEN,ESP,FIN,FRA,GBR,GER,GRE,HKG,ISR,ITA,JPN,LTU,NED,NZL,POL,SUI,SVK,USA">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -25427,7 +24856,7 @@
    SAILING
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
-   <div class="">Men's Windsurfing - Race 11
+   <div class="">Men's Windsurfing - Race 9
 <div class= "competitor HKG"> 🇭🇰 CHENG Ching Yin </div>
 <div class= "competitor SUI"> 🇨🇭 Elia COLOMBO </div>
 <div class= "competitor ARU"> 🇦🇼 Ethan WESTERA </div>
@@ -25455,18 +24884,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240731T141200Z" data-end="20240731T141800Z" 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">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   JUDO
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">Women -70 kg Semifinal of Table B
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240731T141800Z" data-end="20240731T142900Z" data-noc="EGY,UZB">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -25555,6 +24972,38 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240731T143500Z" data-end="20240731T151000Z" data-noc="AUS,BEL,BRA,CAN,CHN,CZE,DEN,ESP,FIN,FRA,GBR,GER,ITA,JPN,NED,NOR,NZL,POL,SWE,USA">
+ <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">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   SAILING
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
+   </div>
+   <div class="">Women's Skiff - Race 12
+<div class= "competitor NED"> 🇳🇱 AANHOLT/DUETZ </div>
+<div class= "competitor NZL"> 🇳🇿 ALEH/MEECH </div>
+<div class= "competitor GER"> 🇩🇪 BERGMANN/WILLE </div>
+<div class= "competitor GBR"> 🇬🇧 BLACK/TIDEY </div>
+<div class= "competitor SWE"> 🇸🇪 BOBECK/NETZLER </div>
+<div class= "competitor CZE"> 🇨🇿 BURSKA/TKADLECOVA </div>
+<div class= "competitor ESP"> 🇪🇸 ECHEGOYEN/BARCELO </div>
+<div class= "competitor CAN"> 🇨🇦 G LEWIN-L./A LEWIN-L. </div>
+<div class= "competitor ITA"> 🇮🇹 GERMANI/BERTUZZI </div>
+<div class= "competitor FIN"> 🇫🇮 GRONBLOM/HOKKA </div>
+<div class= "competitor CHN"> 🇨🇳 HU/SHAN </div>
+<div class= "competitor DEN"> 🇩🇰 J SCHMIDT/A SCHMIDT </div>
+<div class= "competitor BEL"> 🇧🇪 MAENHAUT/GEURTS </div>
+<div class= "competitor POL"> 🇵🇱 MELZACKA/JANKOWIAK </div>
+<div class= "competitor NOR"> 🇳🇴 NAESS/ROENNINGEN </div>
+<div class= "competitor AUS"> 🇦🇺 PRICE/HASELDINE </div>
+<div class= "competitor USA"> 🇺🇸 ROBLE/SHEA </div>
+<div class= "competitor BRA"> 🇧🇷 SOFFIATTI/KUNZE </div>
+<div class= "competitor FRA"> 🇫🇷 STEYAERT/PICON </div>
+<div class= "competitor JPN"> 🇯🇵 TANAKA/NAGAMATSU </div>
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240731T143600Z" data-end="20240731T144200Z" 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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -25567,38 +25016,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240731T143700Z" data-end="20240731T151200Z" data-noc="AUS,AUT,BEL,BRA,CAN,CHN,CRO,DEN,ESP,FRA,GBR,GER,HKG,IRL,NED,NZL,POL,SUI,URU,USA">
- <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">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   SAILING
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div class="">Men's Skiff - Race 12
-<div class= "competitor CAN"> 🇨🇦 BARNES/JONES </div>
-<div class= "competitor USA"> 🇺🇸 BARROWS/HENKEN </div>
-<div class= "competitor AUT"> 🇦🇹 BILDSTEIN/HUSSL </div>
-<div class= "competitor ESP"> 🇪🇸 BOTIN/TRITTEL </div>
-<div class= "competitor POL"> 🇵🇱 BUKSAK/WIERZBICKI </div>
-<div class= "competitor AUS"> 🇦🇺 COLLEY/CONNOR </div>
-<div class= "competitor FRA"> 🇫🇷 FISCHER/PEQUIN </div>
-<div class= "competitor NED"> 🇳🇱 LAMBRIEX/WERKEN </div>
-<div class= "competitor BEL"> 🇧🇪 LEFEBVRE/HEUNINCK </div>
-<div class= "competitor GER"> 🇩🇪 MEGGENDORF/SPRANGER </div>
-<div class= "competitor NZL"> 🇳🇿 McHARDIE/McKENZIE </div>
-<div class= "competitor DEN"> 🇩🇰 NYBORG/BUHL </div>
-<div class= "competitor GBR"> 🇬🇧 PETERS/STERRITT </div>
-<div class= "competitor CRO"> 🇭🇷 S FANTELA/M FANTELA </div>
-<div class= "competitor HKG"> 🇭🇰 SAKAI/ALYSWORTH </div>
-<div class= "competitor SUI"> 🇨🇭 SCHNEITER/de PLANTA </div>
-<div class= "competitor BRA"> 🇧🇷 SOFFIATTI/SIMOES </div>
-<div class= "competitor URU"> 🇺🇾 UMPIERRE/DIZ </div>
-<div class= "competitor IRL"> 🇮🇪 WADDILOVE/DICKSON </div>
-<div class= "competitor CHN"> 🇨🇳 WEN/LIU </div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240731T144000Z" data-end="20240731T153000Z" 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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -25635,6 +25052,42 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240731T144600Z" data-end="20240731T150700Z" data-noc="ALG,ARG,ARU,AUS,BRA,CHN,DEN,ESP,FIN,FRA,GBR,GER,GRE,HKG,ISR,ITA,JPN,LTU,NED,NZL,POL,SUI,SVK,USA">
+ <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">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   SAILING
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div class="">Men's Windsurfing - Race 10
+<div class= "competitor HKG"> 🇭🇰 CHENG Ching Yin </div>
+<div class= "competitor SUI"> 🇨🇭 Elia COLOMBO </div>
+<div class= "competitor ARU"> 🇦🇼 Ethan WESTERA </div>
+<div class= "competitor ARG"> 🇦🇷 Francisco CRUZ SAUBIDET BIRKNER </div>
+<div class= "competitor AUS"> 🇦🇺 Grae MORRIS </div>
+<div class= "competitor CHN"> 🇨🇳 HUANG Jingye </div>
+<div class= "competitor FIN"> 🇫🇮 Jakob EKLUND </div>
+<div class= "competitor DEN"> 🇩🇰 Johan SOE </div>
+<div class= "competitor NZL"> 🇳🇿 Josh ARMIT </div>
+<div class= "competitor NED"> 🇳🇱 Luuc van OPZEELAND </div>
+<div class= "competitor BRA"> 🇧🇷 Mateus ISAAC </div>
+<div class= "competitor ESP"> 🇪🇸 Nacho BALTASAR SUMMERS </div>
+<div class= "competitor FRA"> 🇫🇷 Nicolas GOYARD </div>
+<div class= "competitor ITA"> 🇮🇹 Nicolo RENNA </div>
+<div class= "competitor USA"> 🇺🇸 Noah LYONS </div>
+<div class= "competitor POL"> 🇵🇱 Pawel TARNOWSKI </div>
+<div class= "competitor ALG"> 🇩🇿 Rami BOUDROUMA </div>
+<div class= "competitor SVK"> 🇸🇰 Robert KUBIN </div>
+<div class= "competitor LTU"> 🇱🇹 Rytis JASIUNAS </div>
+<div class= "competitor GBR"> 🇬🇧 Sam SILLS </div>
+<div class= "competitor GER"> 🇩🇪 Sebastian KOERDEL </div>
+<div class= "competitor JPN"> 🇯🇵 TOMIZAWA Makoto </div>
+<div class= "competitor ISR"> 🇮🇱 Tom REUVENY </div>
+<div class= "competitor GRE"> 🇬🇷 Vyron KOKKALANIS </div>
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240731T144800Z" data-end="20240731T145400Z" 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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -25647,42 +25100,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240731T144800Z" data-end="20240731T150900Z" data-noc="ARG,AUT,CHN,CRO,CYP,CZE,ESP,EST,FRA,GBR,GER,HKG,ISR,ITA,MEX,NED,NOR,NZL,PER,POL,SLO,SWE,TUR,USA">
- <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">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   SAILING
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">Women's Windsurfing - Race 8
-<div class= "competitor ARG"> 🇦🇷 Chiara FERRETTI </div>
-<div class= "competitor USA"> 🇺🇸 Dominique STATER </div>
-<div class= "competitor GBR"> 🇬🇧 Emma WILSON </div>
-<div class= "competitor FRA"> 🇫🇷 Helene NOESMOEN </div>
-<div class= "competitor EST"> 🇪🇪 Ingrid PUUSTA </div>
-<div class= "competitor SWE"> 🇸🇪 Johanna HJERTBERG </div>
-<div class= "competitor CZE"> 🇨🇿 Katerina SVIKOVA </div>
-<div class= "competitor SLO"> 🇸🇮 Lina ERZEN </div>
-<div class= "competitor AUT"> 🇦🇹 Lorena ABICHT </div>
-<div class= "competitor HKG"> 🇭🇰 MA Kwan Ching </div>
-<div class= "competitor POL"> 🇵🇱 Maja DZIARNOWSKA </div>
-<div class= "competitor PER"> 🇵🇪 Maria Belen BAZO GERMAN </div>
-<div class= "competitor MEX"> 🇲🇽 Mariana AGUILAR CHAVEZ PEON </div>
-<div class= "competitor ITA"> 🇮🇹 Marta MAGGETTI </div>
-<div class= "competitor TUR"> 🇹🇷 Merve VATAN </div>
-<div class= "competitor NOR"> 🇳🇴 Mina MOBEKK </div>
-<div class= "competitor CYP"> 🇨🇾 Natasa LAPPA </div>
-<div class= "competitor CRO"> 🇭🇷 Palma CARGO </div>
-<div class= "competitor ESP"> 🇪🇸 Pilar LAMADRID TRUEBA </div>
-<div class= "competitor NED"> 🇳🇱 Sara WENNEKES </div>
-<div class= "competitor ISR"> 🇮🇱 Sharon KANTOR </div>
-<div class= "competitor GER"> 🇩🇪 Theresa Marie STEINLEIN </div>
-<div class= "competitor NZL"> 🇳🇿 Veerle TEN HAVE </div>
-<div class= "competitor CHN"> 🇨🇳 YAN Zheng </div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240731T145000Z" data-end="20240731T150100Z" data-noc="JPN,JOR">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -25873,42 +25290,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240731T151900Z" data-end="20240731T154000Z" data-noc="ARG,AUT,CHN,CRO,CYP,CZE,ESP,EST,FRA,GBR,GER,HKG,ISR,ITA,MEX,NED,NOR,NZL,PER,POL,SLO,SWE,TUR,USA">
- <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">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   SAILING
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">Women's Windsurfing - Race 9
-<div class= "competitor ARG"> 🇦🇷 Chiara FERRETTI </div>
-<div class= "competitor USA"> 🇺🇸 Dominique STATER </div>
-<div class= "competitor GBR"> 🇬🇧 Emma WILSON </div>
-<div class= "competitor FRA"> 🇫🇷 Helene NOESMOEN </div>
-<div class= "competitor EST"> 🇪🇪 Ingrid PUUSTA </div>
-<div class= "competitor SWE"> 🇸🇪 Johanna HJERTBERG </div>
-<div class= "competitor CZE"> 🇨🇿 Katerina SVIKOVA </div>
-<div class= "competitor SLO"> 🇸🇮 Lina ERZEN </div>
-<div class= "competitor AUT"> 🇦🇹 Lorena ABICHT </div>
-<div class= "competitor HKG"> 🇭🇰 MA Kwan Ching </div>
-<div class= "competitor POL"> 🇵🇱 Maja DZIARNOWSKA </div>
-<div class= "competitor PER"> 🇵🇪 Maria Belen BAZO GERMAN </div>
-<div class= "competitor MEX"> 🇲🇽 Mariana AGUILAR CHAVEZ PEON </div>
-<div class= "competitor ITA"> 🇮🇹 Marta MAGGETTI </div>
-<div class= "competitor TUR"> 🇹🇷 Merve VATAN </div>
-<div class= "competitor NOR"> 🇳🇴 Mina MOBEKK </div>
-<div class= "competitor CYP"> 🇨🇾 Natasa LAPPA </div>
-<div class= "competitor CRO"> 🇭🇷 Palma CARGO </div>
-<div class= "competitor ESP"> 🇪🇸 Pilar LAMADRID TRUEBA </div>
-<div class= "competitor NED"> 🇳🇱 Sara WENNEKES </div>
-<div class= "competitor ISR"> 🇮🇱 Sharon KANTOR </div>
-<div class= "competitor GER"> 🇩🇪 Theresa Marie STEINLEIN </div>
-<div class= "competitor NZL"> 🇳🇿 Veerle TEN HAVE </div>
-<div class= "competitor CHN"> 🇨🇳 YAN Zheng </div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240731T152200Z" data-end="20240731T153300Z" data-noc="THA,FRA">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -26034,42 +25415,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240731T155000Z" data-end="20240731T161100Z" data-noc="ARG,AUT,CHN,CRO,CYP,CZE,ESP,EST,FRA,GBR,GER,HKG,ISR,ITA,MEX,NED,NOR,NZL,PER,POL,SLO,SWE,TUR,USA">
- <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">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   SAILING
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">Women's Windsurfing - Race 10
-<div class= "competitor ARG"> 🇦🇷 Chiara FERRETTI </div>
-<div class= "competitor USA"> 🇺🇸 Dominique STATER </div>
-<div class= "competitor GBR"> 🇬🇧 Emma WILSON </div>
-<div class= "competitor FRA"> 🇫🇷 Helene NOESMOEN </div>
-<div class= "competitor EST"> 🇪🇪 Ingrid PUUSTA </div>
-<div class= "competitor SWE"> 🇸🇪 Johanna HJERTBERG </div>
-<div class= "competitor CZE"> 🇨🇿 Katerina SVIKOVA </div>
-<div class= "competitor SLO"> 🇸🇮 Lina ERZEN </div>
-<div class= "competitor AUT"> 🇦🇹 Lorena ABICHT </div>
-<div class= "competitor HKG"> 🇭🇰 MA Kwan Ching </div>
-<div class= "competitor POL"> 🇵🇱 Maja DZIARNOWSKA </div>
-<div class= "competitor PER"> 🇵🇪 Maria Belen BAZO GERMAN </div>
-<div class= "competitor MEX"> 🇲🇽 Mariana AGUILAR CHAVEZ PEON </div>
-<div class= "competitor ITA"> 🇮🇹 Marta MAGGETTI </div>
-<div class= "competitor TUR"> 🇹🇷 Merve VATAN </div>
-<div class= "competitor NOR"> 🇳🇴 Mina MOBEKK </div>
-<div class= "competitor CYP"> 🇨🇾 Natasa LAPPA </div>
-<div class= "competitor CRO"> 🇭🇷 Palma CARGO </div>
-<div class= "competitor ESP"> 🇪🇸 Pilar LAMADRID TRUEBA </div>
-<div class= "competitor NED"> 🇳🇱 Sara WENNEKES </div>
-<div class= "competitor ISR"> 🇮🇱 Sharon KANTOR </div>
-<div class= "competitor GER"> 🇩🇪 Theresa Marie STEINLEIN </div>
-<div class= "competitor NZL"> 🇳🇿 Veerle TEN HAVE </div>
-<div class= "competitor CHN"> 🇨🇳 YAN Zheng </div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240731T155400Z" data-end="20240731T160500Z" data-noc="IRL,COL">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -26122,42 +25467,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240731T162100Z" data-end="20240731T164200Z" data-noc="ARG,AUT,CHN,CRO,CYP,CZE,ESP,EST,FRA,GBR,GER,HKG,ISR,ITA,MEX,NED,NOR,NZL,PER,POL,SLO,SWE,TUR,USA">
- <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">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   SAILING
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">Women's Windsurfing - Race 11
-<div class= "competitor ARG"> 🇦🇷 Chiara FERRETTI </div>
-<div class= "competitor USA"> 🇺🇸 Dominique STATER </div>
-<div class= "competitor GBR"> 🇬🇧 Emma WILSON </div>
-<div class= "competitor FRA"> 🇫🇷 Helene NOESMOEN </div>
-<div class= "competitor EST"> 🇪🇪 Ingrid PUUSTA </div>
-<div class= "competitor SWE"> 🇸🇪 Johanna HJERTBERG </div>
-<div class= "competitor CZE"> 🇨🇿 Katerina SVIKOVA </div>
-<div class= "competitor SLO"> 🇸🇮 Lina ERZEN </div>
-<div class= "competitor AUT"> 🇦🇹 Lorena ABICHT </div>
-<div class= "competitor HKG"> 🇭🇰 MA Kwan Ching </div>
-<div class= "competitor POL"> 🇵🇱 Maja DZIARNOWSKA </div>
-<div class= "competitor PER"> 🇵🇪 Maria Belen BAZO GERMAN </div>
-<div class= "competitor MEX"> 🇲🇽 Mariana AGUILAR CHAVEZ PEON </div>
-<div class= "competitor ITA"> 🇮🇹 Marta MAGGETTI </div>
-<div class= "competitor TUR"> 🇹🇷 Merve VATAN </div>
-<div class= "competitor NOR"> 🇳🇴 Mina MOBEKK </div>
-<div class= "competitor CYP"> 🇨🇾 Natasa LAPPA </div>
-<div class= "competitor CRO"> 🇭🇷 Palma CARGO </div>
-<div class= "competitor ESP"> 🇪🇸 Pilar LAMADRID TRUEBA </div>
-<div class= "competitor NED"> 🇳🇱 Sara WENNEKES </div>
-<div class= "competitor ISR"> 🇮🇱 Sharon KANTOR </div>
-<div class= "competitor GER"> 🇩🇪 Theresa Marie STEINLEIN </div>
-<div class= "competitor NZL"> 🇳🇿 Veerle TEN HAVE </div>
-<div class= "competitor CHN"> 🇨🇳 YAN Zheng </div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240731T162400Z" data-end="20240731T163700Z" data-noc="GBR,ESP">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -26221,42 +25530,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240731T165200Z" data-end="20240731T171300Z" data-noc="ARG,AUT,CHN,CRO,CYP,CZE,ESP,EST,FRA,GBR,GER,HKG,ISR,ITA,MEX,NED,NOR,NZL,PER,POL,SLO,SWE,TUR,USA">
- <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">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   SAILING
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">Women's Windsurfing - Race 12
-<div class= "competitor ARG"> 🇦🇷 Chiara FERRETTI </div>
-<div class= "competitor USA"> 🇺🇸 Dominique STATER </div>
-<div class= "competitor GBR"> 🇬🇧 Emma WILSON </div>
-<div class= "competitor FRA"> 🇫🇷 Helene NOESMOEN </div>
-<div class= "competitor EST"> 🇪🇪 Ingrid PUUSTA </div>
-<div class= "competitor SWE"> 🇸🇪 Johanna HJERTBERG </div>
-<div class= "competitor CZE"> 🇨🇿 Katerina SVIKOVA </div>
-<div class= "competitor SLO"> 🇸🇮 Lina ERZEN </div>
-<div class= "competitor AUT"> 🇦🇹 Lorena ABICHT </div>
-<div class= "competitor HKG"> 🇭🇰 MA Kwan Ching </div>
-<div class= "competitor POL"> 🇵🇱 Maja DZIARNOWSKA </div>
-<div class= "competitor PER"> 🇵🇪 Maria Belen BAZO GERMAN </div>
-<div class= "competitor MEX"> 🇲🇽 Mariana AGUILAR CHAVEZ PEON </div>
-<div class= "competitor ITA"> 🇮🇹 Marta MAGGETTI </div>
-<div class= "competitor TUR"> 🇹🇷 Merve VATAN </div>
-<div class= "competitor NOR"> 🇳🇴 Mina MOBEKK </div>
-<div class= "competitor CYP"> 🇨🇾 Natasa LAPPA </div>
-<div class= "competitor CRO"> 🇭🇷 Palma CARGO </div>
-<div class= "competitor ESP"> 🇪🇸 Pilar LAMADRID TRUEBA </div>
-<div class= "competitor NED"> 🇳🇱 Sara WENNEKES </div>
-<div class= "competitor ISR"> 🇮🇱 Sharon KANTOR </div>
-<div class= "competitor GER"> 🇩🇪 Theresa Marie STEINLEIN </div>
-<div class= "competitor NZL"> 🇳🇿 Veerle TEN HAVE </div>
-<div class= "competitor CHN"> 🇨🇳 YAN Zheng </div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240731T170000Z" data-end="20240731T190000Z" data-noc="AUS,USA">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -28978,7 +28251,7 @@
    SAILING
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
-   <div class="">Women's Windsurfing - Race 13
+   <div class="">Women's Windsurfing - Race 12
 <div class= "competitor ARG"> 🇦🇷 Chiara FERRETTI </div>
 <div class= "competitor USA"> 🇺🇸 Dominique STATER </div>
 <div class= "competitor GBR"> 🇬🇧 Emma WILSON </div>
@@ -29072,7 +28345,7 @@
    SAILING
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
-   <div class="">Women's Windsurfing - Race 14
+   <div class="">Women's Windsurfing - Race 13
 <div class= "competitor ARG"> 🇦🇷 Chiara FERRETTI </div>
 <div class= "competitor USA"> 🇺🇸 Dominique STATER </div>
 <div class= "competitor GBR"> 🇬🇧 Emma WILSON </div>
@@ -29158,7 +28431,7 @@
    SAILING
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
-   <div class="">Men's Windsurfing - Race 12
+   <div class="">Men's Windsurfing - Race 11
 <div class= "competitor HKG"> 🇭🇰 CHENG Ching Yin </div>
 <div class= "competitor SUI"> 🇨🇭 Elia COLOMBO </div>
 <div class= "competitor ARU"> 🇦🇼 Ethan WESTERA </div>
@@ -29294,7 +28567,7 @@
    SAILING
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
-   <div class="">Women's Windsurfing - Race 15
+   <div class="">Women's Windsurfing - Race 14
 <div class= "competitor ARG"> 🇦🇷 Chiara FERRETTI </div>
 <div class= "competitor USA"> 🇺🇸 Dominique STATER </div>
 <div class= "competitor GBR"> 🇬🇧 Emma WILSON </div>
@@ -29416,7 +28689,7 @@
    SAILING
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
-   <div class="">Men's Windsurfing - Race 13
+   <div class="">Men's Windsurfing - Race 12
 <div class= "competitor HKG"> 🇭🇰 CHENG Ching Yin </div>
 <div class= "competitor SUI"> 🇨🇭 Elia COLOMBO </div>
 <div class= "competitor ARU"> 🇦🇼 Ethan WESTERA </div>
@@ -29514,7 +28787,7 @@
    SAILING
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
-   <div class="">Women's Windsurfing - Race 16
+   <div class="">Women's Windsurfing - Race 15
 <div class= "competitor ARG"> 🇦🇷 Chiara FERRETTI </div>
 <div class= "competitor USA"> 🇺🇸 Dominique STATER </div>
 <div class= "competitor GBR"> 🇬🇧 Emma WILSON </div>
@@ -29624,7 +28897,7 @@
    SAILING
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
-   <div class="">Men's Windsurfing - Race 14
+   <div class="">Men's Windsurfing - Race 13
 <div class= "competitor HKG"> 🇭🇰 CHENG Ching Yin </div>
 <div class= "competitor SUI"> 🇨🇭 Elia COLOMBO </div>
 <div class= "competitor ARU"> 🇦🇼 Ethan WESTERA </div>
@@ -29761,7 +29034,7 @@
    SAILING
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
-   <div class="">Women's Windsurfing - Race 17
+   <div class="">Women's Windsurfing - Race 16
 <div class= "competitor ARG"> 🇦🇷 Chiara FERRETTI </div>
 <div class= "competitor USA"> 🇺🇸 Dominique STATER </div>
 <div class= "competitor GBR"> 🇬🇧 Emma WILSON </div>
@@ -29860,7 +29133,7 @@
    SAILING
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
-   <div class="">Men's Windsurfing - Race 15
+   <div class="">Men's Windsurfing - Race 14
 <div class= "competitor HKG"> 🇭🇰 CHENG Ching Yin </div>
 <div class= "competitor SUI"> 🇨🇭 Elia COLOMBO </div>
 <div class= "competitor ARU"> 🇦🇼 Ethan WESTERA </div>
@@ -29944,6 +29217,42 @@
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
    
+   SAILING
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
+   </div>
+   <div class="">Women's Windsurfing - Race 17
+<div class= "competitor ARG"> 🇦🇷 Chiara FERRETTI </div>
+<div class= "competitor USA"> 🇺🇸 Dominique STATER </div>
+<div class= "competitor GBR"> 🇬🇧 Emma WILSON </div>
+<div class= "competitor FRA"> 🇫🇷 Helene NOESMOEN </div>
+<div class= "competitor EST"> 🇪🇪 Ingrid PUUSTA </div>
+<div class= "competitor SWE"> 🇸🇪 Johanna HJERTBERG </div>
+<div class= "competitor CZE"> 🇨🇿 Katerina SVIKOVA </div>
+<div class= "competitor SLO"> 🇸🇮 Lina ERZEN </div>
+<div class= "competitor AUT"> 🇦🇹 Lorena ABICHT </div>
+<div class= "competitor HKG"> 🇭🇰 MA Kwan Ching </div>
+<div class= "competitor POL"> 🇵🇱 Maja DZIARNOWSKA </div>
+<div class= "competitor PER"> 🇵🇪 Maria Belen BAZO GERMAN </div>
+<div class= "competitor MEX"> 🇲🇽 Mariana AGUILAR CHAVEZ PEON </div>
+<div class= "competitor ITA"> 🇮🇹 Marta MAGGETTI </div>
+<div class= "competitor TUR"> 🇹🇷 Merve VATAN </div>
+<div class= "competitor NOR"> 🇳🇴 Mina MOBEKK </div>
+<div class= "competitor CYP"> 🇨🇾 Natasa LAPPA </div>
+<div class= "competitor CRO"> 🇭🇷 Palma CARGO </div>
+<div class= "competitor ESP"> 🇪🇸 Pilar LAMADRID TRUEBA </div>
+<div class= "competitor NED"> 🇳🇱 Sara WENNEKES </div>
+<div class= "competitor ISR"> 🇮🇱 Sharon KANTOR </div>
+<div class= "competitor GER"> 🇩🇪 Theresa Marie STEINLEIN </div>
+<div class= "competitor NZL"> 🇳🇿 Veerle TEN HAVE </div>
+<div class= "competitor CHN"> 🇨🇳 YAN Zheng </div>
+   </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240801T153800Z" data-end="20240801T155900Z" data-noc="ARG,AUT,CHN,CRO,CYP,CZE,ESP,EST,FRA,GBR,GER,HKG,ISR,ITA,MEX,NED,NOR,NZL,PER,POL,SLO,SWE,TUR,USA">
+ <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">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
    SAILING
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
@@ -30020,7 +29329,7 @@
    SAILING
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
-   <div class="">Men's Windsurfing - Race 16
+   <div class="">Men's Windsurfing - Race 15
 <div class= "competitor HKG"> 🇭🇰 CHENG Ching Yin </div>
 <div class= "competitor SUI"> 🇨🇭 Elia COLOMBO </div>
 <div class= "competitor ARU"> 🇦🇼 Ethan WESTERA </div>
@@ -30140,6 +29449,42 @@
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
    
+   SAILING
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div class="">Men's Windsurfing - Race 16
+<div class= "competitor HKG"> 🇭🇰 CHENG Ching Yin </div>
+<div class= "competitor SUI"> 🇨🇭 Elia COLOMBO </div>
+<div class= "competitor ARU"> 🇦🇼 Ethan WESTERA </div>
+<div class= "competitor ARG"> 🇦🇷 Francisco CRUZ SAUBIDET BIRKNER </div>
+<div class= "competitor AUS"> 🇦🇺 Grae MORRIS </div>
+<div class= "competitor CHN"> 🇨🇳 HUANG Jingye </div>
+<div class= "competitor FIN"> 🇫🇮 Jakob EKLUND </div>
+<div class= "competitor DEN"> 🇩🇰 Johan SOE </div>
+<div class= "competitor NZL"> 🇳🇿 Josh ARMIT </div>
+<div class= "competitor NED"> 🇳🇱 Luuc van OPZEELAND </div>
+<div class= "competitor BRA"> 🇧🇷 Mateus ISAAC </div>
+<div class= "competitor ESP"> 🇪🇸 Nacho BALTASAR SUMMERS </div>
+<div class= "competitor FRA"> 🇫🇷 Nicolas GOYARD </div>
+<div class= "competitor ITA"> 🇮🇹 Nicolo RENNA </div>
+<div class= "competitor USA"> 🇺🇸 Noah LYONS </div>
+<div class= "competitor POL"> 🇵🇱 Pawel TARNOWSKI </div>
+<div class= "competitor ALG"> 🇩🇿 Rami BOUDROUMA </div>
+<div class= "competitor SVK"> 🇸🇰 Robert KUBIN </div>
+<div class= "competitor LTU"> 🇱🇹 Rytis JASIUNAS </div>
+<div class= "competitor GBR"> 🇬🇧 Sam SILLS </div>
+<div class= "competitor GER"> 🇩🇪 Sebastian KOERDEL </div>
+<div class= "competitor JPN"> 🇯🇵 TOMIZAWA Makoto </div>
+<div class= "competitor ISR"> 🇮🇱 Tom REUVENY </div>
+<div class= "competitor GRE"> 🇬🇷 Vyron KOKKALANIS </div>
+   </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240801T162800Z" data-end="20240801T164900Z" data-noc="ALG,ARG,ARU,AUS,BRA,CHN,DEN,ESP,FIN,FRA,GBR,GER,GRE,HKG,ISR,ITA,JPN,LTU,NED,NZL,POL,SUI,SVK,USA">
+ <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">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
    SAILING
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>