diff --git a/docs/general/AUS.ics b/docs/general/AUS.ics
index c01a3bf13..8f278954c 100644
--- a/docs/general/AUS.ics
+++ b/docs/general/AUS.ics
@@ -882,6 +882,15 @@ SUMMARY:🏊 Women's 100m Butterfly Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-FRA-AUS
+DTSTAMP:20240728T184800Z
+DTSTART:20240728T184800Z
+DTEND:20240728T191800Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 4
+SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇦🇺 Molly PICKLUM
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T012400Z-surfing-MENS-ROUND-2-HEAT-7-AUS-PER
 DTSTAMP:20240729T012400Z
 DTSTART:20240729T012400Z
diff --git a/docs/general/BRA.ics b/docs/general/BRA.ics
index fa26cf664..657d92aac 100644
--- a/docs/general/BRA.ics
+++ b/docs/general/BRA.ics
@@ -815,6 +815,15 @@ SUMMARY:🏓 Andy PEREIRA 🇨🇺 - 🇧🇷 Hugo CALDERANO
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T192400Z-surfing-WOMENS-ROUND-2-HEAT-5-BRA-NCA
+DTSTAMP:20240728T192400Z
+DTSTART:20240728T192400Z
+DTEND:20240728T195400Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 5
+SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇳🇮 Candelaria RESANO
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240728T200000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-64-NGR-BRA
 DTSTAMP:20240728T200000Z
 DTSTART:20240728T200000Z
@@ -824,6 +833,15 @@ SUMMARY:🏓 Offiong EDEM 🇳🇬 - 🇧🇷 Bruna TAKAHASHI
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T203600Z-surfing-WOMENS-ROUND-2-HEAT-7-BRA-CAN
+DTSTAMP:20240728T203600Z
+DTSTART:20240728T203600Z
+DTEND:20240728T210600Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 7
+SUMMARY:🏄 Taina HINCKEL 🇧🇷 - 🇨🇦 Sanoa DEMPFLE-OLIN
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T020000Z-surfing-MENS-ROUND-2-HEAT-8-BRA-NZL
 DTSTAMP:20240729T020000Z
 DTSTART:20240729T020000Z
diff --git a/docs/general/CAN.ics b/docs/general/CAN.ics
index 6370aae3e..db694d9a2 100644
--- a/docs/general/CAN.ics
+++ b/docs/general/CAN.ics
@@ -756,6 +756,15 @@ SUMMARY:🏉 NZL 🇳🇿 - 🇨🇦 CAN
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T203600Z-surfing-WOMENS-ROUND-2-HEAT-7-BRA-CAN
+DTSTAMP:20240728T203600Z
+DTSTART:20240728T203600Z
+DTEND:20240728T210600Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 7
+SUMMARY:🏄 Taina HINCKEL 🇧🇷 - 🇨🇦 Sanoa DEMPFLE-OLIN
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T072500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-64-CAN-ISV
 DTSTAMP:20240729T072500Z
 DTSTART:20240729T072500Z
diff --git a/docs/general/CHN.ics b/docs/general/CHN.ics
index f1589adba..068101b7a 100644
--- a/docs/general/CHN.ics
+++ b/docs/general/CHN.ics
@@ -1067,6 +1067,15 @@ SUMMARY:🏉 NZL 🇳🇿 - 🇨🇳 CHN
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T170000Z-surfing-WOMENS-ROUND-2-HEAT-1-PER-CHN
+DTSTAMP:20240728T170000Z
+DTSTART:20240728T170000Z
+DTEND:20240728T173000Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 1
+SUMMARY:🏄 Sol AGUIRRE 🇵🇪 - 🇨🇳 YANG Siqi
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240728T184000Z-swimming-WOMENS-100M-BUTTERFLY-FINAL
 DTSTAMP:20240728T184000Z
 DTSTART:20240728T184000Z
diff --git a/docs/general/ESP.ics b/docs/general/ESP.ics
index 1248e95ae..7e19cc915 100644
--- a/docs/general/ESP.ics
+++ b/docs/general/ESP.ics
@@ -891,6 +891,15 @@ SUMMARY:🏓 Dina MESHREF 🇪🇬 - 🇪🇸 Maria XIAO
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T211200Z-surfing-WOMENS-ROUND-2-HEAT-8-ISR-ESP
+DTSTAMP:20240728T211200Z
+DTSTART:20240728T211200Z
+DTEND:20240728T214200Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 8
+SUMMARY:🏄 Anat LELIOR 🇮🇱 - 🇪🇸 Janire GONZALEZ ETXABARRI
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T004800Z-surfing-MENS-ROUND-2-HEAT-6-MEX-ESP
 DTSTAMP:20240729T004800Z
 DTSTART:20240729T004800Z
diff --git a/docs/general/FRA.ics b/docs/general/FRA.ics
index 714d288b3..e0e424458 100644
--- a/docs/general/FRA.ics
+++ b/docs/general/FRA.ics
@@ -1387,6 +1387,15 @@ SUMMARY:🏉 FRA 🇫🇷 - 🇯🇵 JPN
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-FRA-AUS
+DTSTAMP:20240728T184800Z
+DTSTART:20240728T184800Z
+DTEND:20240728T191800Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 4
+SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇦🇺 Molly PICKLUM
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240728T190000Z-football-WOMENS-GROUP-A-FRA-CAN
 DTSTAMP:20240728T190000Z
 DTSTART:20240728T190000Z
diff --git a/docs/general/GER.ics b/docs/general/GER.ics
index 151e912b0..77dac1384 100644
--- a/docs/general/GER.ics
+++ b/docs/general/GER.ics
@@ -1034,6 +1034,15 @@ SUMMARY:🎾 Alexander ZVEREV 🇩🇪 - 🇪🇸 Jaume MUNAR
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T173600Z-surfing-WOMENS-ROUND-2-HEAT-2-RSA-GER
+DTSTAMP:20240728T173600Z
+DTSTART:20240728T173600Z
+DTEND:20240728T180600Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 2
+SUMMARY:🏄 Sarah BAUM 🇿🇦 - 🇩🇪 Camilla KEMP
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240728T180000Z-boxing-MENS-71KG-PRELIMINARIES-ROUND-OF-32-GER-MOZ
 DTSTAMP:20240728T180000Z
 DTSTART:20240728T180000Z
diff --git a/docs/general/ISR.ics b/docs/general/ISR.ics
index 18bdad3e7..b0d456aa4 100644
--- a/docs/general/ISR.ics
+++ b/docs/general/ISR.ics
@@ -320,6 +320,15 @@ SUMMARY:⛵ Men's Windsurfing - Race 4
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T211200Z-surfing-WOMENS-ROUND-2-HEAT-8-ISR-ESP
+DTSTAMP:20240728T211200Z
+DTSTART:20240728T211200Z
+DTEND:20240728T214200Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 8
+SUMMARY:🏄 Anat LELIOR 🇮🇱 - 🇪🇸 Janire GONZALEZ ETXABARRI
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T080000Z-judo-MEN-73-KG-ELIMINATION-ROUND-OF-32-ISR-ALG
 DTSTAMP:20240729T080000Z
 DTSTART:20240729T080000Z
diff --git a/docs/general/JPN.ics b/docs/general/JPN.ics
index df4fb1729..771075415 100644
--- a/docs/general/JPN.ics
+++ b/docs/general/JPN.ics
@@ -981,6 +981,15 @@ SUMMARY:⚽ BRA 🇧🇷 - 🇯🇵 JPN
 LOCATION:Parc des Princes
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T181200Z-surfing-WOMENS-ROUND-2-HEAT-3-JPN-POR
+DTSTAMP:20240728T181200Z
+DTSTART:20240728T181200Z
+DTEND:20240728T184200Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 3
+SUMMARY:🏄 MATSUDA Shino 🇯🇵 - 🇵🇹 Teresa BONVALOT
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240728T183000Z-rugby-sevens-WOMENS-POOL-C-FRA-JPN
 DTSTAMP:20240728T183000Z
 DTSTART:20240728T183000Z
diff --git a/docs/general/NCA.ics b/docs/general/NCA.ics
index c581dbe03..c90694222 100644
--- a/docs/general/NCA.ics
+++ b/docs/general/NCA.ics
@@ -47,6 +47,15 @@ SUMMARY:🔫 10m Air Rifle Women's Qualification
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T192400Z-surfing-WOMENS-ROUND-2-HEAT-5-BRA-NCA
+DTSTAMP:20240728T192400Z
+DTSTART:20240728T192400Z
+DTEND:20240728T195400Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 5
+SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇳🇮 Candelaria RESANO
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240802T082400Z-judo-WOMEN-78-KG-ELIMINATION-ROUND-OF-32-CAN-NCA
 DTSTAMP:20240802T082400Z
 DTSTART:20240802T082400Z
diff --git a/docs/general/NZL.ics b/docs/general/NZL.ics
index 60822bdf6..0e7115977 100644
--- a/docs/general/NZL.ics
+++ b/docs/general/NZL.ics
@@ -606,6 +606,15 @@ SUMMARY:🏉 NZL 🇳🇿 - 🇨🇦 CAN
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T200000Z-surfing-WOMENS-ROUND-2-HEAT-6-NZL-POR
+DTSTAMP:20240728T200000Z
+DTSTART:20240728T200000Z
+DTEND:20240728T203000Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 6
+SUMMARY:🏄 Saffi VETTE 🇳🇿 - 🇵🇹 Yolanda HOPKINS
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T020000Z-surfing-MENS-ROUND-2-HEAT-8-BRA-NZL
 DTSTAMP:20240729T020000Z
 DTSTART:20240729T020000Z
diff --git a/docs/general/PER.ics b/docs/general/PER.ics
index 48a16c354..df9c0b65b 100644
--- a/docs/general/PER.ics
+++ b/docs/general/PER.ics
@@ -129,6 +129,15 @@ SUMMARY:⛵ Women's Windsurfing - Race 4
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T170000Z-surfing-WOMENS-ROUND-2-HEAT-1-PER-CHN
+DTSTAMP:20240728T170000Z
+DTSTART:20240728T170000Z
+DTEND:20240728T173000Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 1
+SUMMARY:🏄 Sol AGUIRRE 🇵🇪 - 🇨🇳 YANG Siqi
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T012400Z-surfing-MENS-ROUND-2-HEAT-7-AUS-PER
 DTSTAMP:20240729T012400Z
 DTSTART:20240729T012400Z
diff --git a/docs/general/POR.ics b/docs/general/POR.ics
index 1dbc35ba5..1c64c346d 100644
--- a/docs/general/POR.ics
+++ b/docs/general/POR.ics
@@ -187,6 +187,24 @@ SUMMARY:🚴 Women's Cross-country
 LOCATION:Elancourt Hill
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T181200Z-surfing-WOMENS-ROUND-2-HEAT-3-JPN-POR
+DTSTAMP:20240728T181200Z
+DTSTART:20240728T181200Z
+DTEND:20240728T184200Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 3
+SUMMARY:🏄 MATSUDA Shino 🇯🇵 - 🇵🇹 Teresa BONVALOT
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
+UID:20240728T200000Z-surfing-WOMENS-ROUND-2-HEAT-6-NZL-POR
+DTSTAMP:20240728T200000Z
+DTSTART:20240728T200000Z
+DTEND:20240728T203000Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 6
+SUMMARY:🏄 Saffi VETTE 🇳🇿 - 🇵🇹 Yolanda HOPKINS
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240728T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-64-POR-GER
 DTSTAMP:20240728T200000Z
 DTSTART:20240728T200000Z
diff --git a/docs/general/RSA.ics b/docs/general/RSA.ics
index 02fc6dbb0..da39da486 100644
--- a/docs/general/RSA.ics
+++ b/docs/general/RSA.ics
@@ -294,6 +294,15 @@ SUMMARY:🏉 IRL 🇮🇪 - 🇿🇦 RSA
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T173600Z-surfing-WOMENS-ROUND-2-HEAT-2-RSA-GER
+DTSTAMP:20240728T173600Z
+DTSTART:20240728T173600Z
+DTEND:20240728T180600Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 2
+SUMMARY:🏄 Sarah BAUM 🇿🇦 - 🇩🇪 Camilla KEMP
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240728T181500Z-hockey-MENS-POOL-A-RSA-GBR
 DTSTAMP:20240728T181500Z
 DTSTART:20240728T181500Z
diff --git a/docs/general/general.ics b/docs/general/general.ics
index 5fe2f8047..8857a6515 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -6990,12 +6990,12 @@ SUMMARY:🏉 IRL 🇮🇪 - 🇿🇦 RSA
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T170000Z-surfing-WOMENS-ROUND-2-HEAT-1
+UID:20240728T170000Z-surfing-WOMENS-ROUND-2-HEAT-1-PER-CHN
 DTSTAMP:20240728T170000Z
 DTSTART:20240728T170000Z
 DTEND:20240728T173000Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 1
-SUMMARY:🏄 Women's Round 2 - Heat 1
+SUMMARY:🏄 Sol AGUIRRE 🇵🇪 - 🇨🇳 YANG Siqi
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
@@ -7071,12 +7071,12 @@ SUMMARY:🤽 FRA 🇫🇷 - 🇭🇺 HUN
 LOCATION:Aquatics Centre
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T173600Z-surfing-WOMENS-ROUND-2-HEAT-2
+UID:20240728T173600Z-surfing-WOMENS-ROUND-2-HEAT-2-RSA-GER
 DTSTAMP:20240728T173600Z
 DTSTART:20240728T173600Z
 DTEND:20240728T180600Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 2
-SUMMARY:🏄 Women's Round 2 - Heat 2
+SUMMARY:🏄 Sarah BAUM 🇿🇦 - 🇩🇪 Camilla KEMP
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
@@ -7161,12 +7161,12 @@ SUMMARY:🏓 Lily ZHANG 🇺🇸 - 🇱🇧 Mariana SAHAKIAN
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T181200Z-surfing-WOMENS-ROUND-2-HEAT-3
+UID:20240728T181200Z-surfing-WOMENS-ROUND-2-HEAT-3-JPN-POR
 DTSTAMP:20240728T181200Z
 DTSTART:20240728T181200Z
 DTEND:20240728T184200Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 3
-SUMMARY:🏄 Women's Round 2 - Heat 3
+SUMMARY:🏄 MATSUDA Shino 🇯🇵 - 🇵🇹 Teresa BONVALOT
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
@@ -7281,12 +7281,12 @@ SUMMARY:🥊 Georgii KUSHITASHVILI 🇬🇪 - 🇹🇯 Davlat BOLTAEV
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4
+UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-FRA-AUS
 DTSTAMP:20240728T184800Z
 DTSTART:20240728T184800Z
 DTEND:20240728T191800Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 4
-SUMMARY:🏄 Women's Round 2 - Heat 4
+SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇦🇺 Molly PICKLUM
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
@@ -7479,12 +7479,12 @@ SUMMARY:🤺 Men's Épée Individual Bronze Medal Bout
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T192400Z-surfing-WOMENS-ROUND-2-HEAT-5
+UID:20240728T192400Z-surfing-WOMENS-ROUND-2-HEAT-5-BRA-NCA
 DTSTAMP:20240728T192400Z
 DTSTART:20240728T192400Z
 DTEND:20240728T195400Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 5
-SUMMARY:🏄 Women's Round 2 - Heat 5
+SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇳🇮 Candelaria RESANO
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
@@ -7562,12 +7562,12 @@ SUMMARY:🏐 HUGHES/CHENG 🇺🇸 - 🇨🇿 HERMANNOVA/STOCHLOVA
 LOCATION:Eiffel Tower Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T200000Z-surfing-WOMENS-ROUND-2-HEAT-6
+UID:20240728T200000Z-surfing-WOMENS-ROUND-2-HEAT-6-NZL-POR
 DTSTAMP:20240728T200000Z
 DTSTART:20240728T200000Z
 DTEND:20240728T203000Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 6
-SUMMARY:🏄 Women's Round 2 - Heat 6
+SUMMARY:🏄 Saffi VETTE 🇳🇿 - 🇵🇹 Yolanda HOPKINS
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
@@ -7616,21 +7616,21 @@ SUMMARY:🤺 Men's Épée Individual Gold Medal Bout
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T203600Z-surfing-WOMENS-ROUND-2-HEAT-7
+UID:20240728T203600Z-surfing-WOMENS-ROUND-2-HEAT-7-BRA-CAN
 DTSTAMP:20240728T203600Z
 DTSTART:20240728T203600Z
 DTEND:20240728T210600Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 7
-SUMMARY:🏄 Women's Round 2 - Heat 7
+SUMMARY:🏄 Taina HINCKEL 🇧🇷 - 🇨🇦 Sanoa DEMPFLE-OLIN
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T211200Z-surfing-WOMENS-ROUND-2-HEAT-8
+UID:20240728T211200Z-surfing-WOMENS-ROUND-2-HEAT-8-ISR-ESP
 DTSTAMP:20240728T211200Z
 DTSTART:20240728T211200Z
 DTEND:20240728T214200Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 8
-SUMMARY:🏄 Women's Round 2 - Heat 8
+SUMMARY:🏄 Anat LELIOR 🇮🇱 - 🇪🇸 Janire GONZALEZ ETXABARRI
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/surfing/AUS.ics b/docs/surfing/AUS.ics
index 2fb58dac7..edd876d5e 100644
--- a/docs/surfing/AUS.ics
+++ b/docs/surfing/AUS.ics
@@ -44,6 +44,15 @@ SUMMARY:🏄 Women's Round 1 - Heat 4
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-FRA-AUS
+DTSTAMP:20240728T184800Z
+DTSTART:20240728T184800Z
+DTEND:20240728T191800Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 4
+SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇦🇺 Molly PICKLUM
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T012400Z-surfing-MENS-ROUND-2-HEAT-7-AUS-PER
 DTSTAMP:20240729T012400Z
 DTSTART:20240729T012400Z
diff --git a/docs/surfing/BRA.ics b/docs/surfing/BRA.ics
index e65bf70ff..0e6a34687 100644
--- a/docs/surfing/BRA.ics
+++ b/docs/surfing/BRA.ics
@@ -54,6 +54,24 @@ SUMMARY:🏄 Women's Round 1 - Heat 6
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T192400Z-surfing-WOMENS-ROUND-2-HEAT-5-BRA-NCA
+DTSTAMP:20240728T192400Z
+DTSTART:20240728T192400Z
+DTEND:20240728T195400Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 5
+SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇳🇮 Candelaria RESANO
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
+UID:20240728T203600Z-surfing-WOMENS-ROUND-2-HEAT-7-BRA-CAN
+DTSTAMP:20240728T203600Z
+DTSTART:20240728T203600Z
+DTEND:20240728T210600Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 7
+SUMMARY:🏄 Taina HINCKEL 🇧🇷 - 🇨🇦 Sanoa DEMPFLE-OLIN
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T020000Z-surfing-MENS-ROUND-2-HEAT-8-BRA-NZL
 DTSTAMP:20240729T020000Z
 DTSTART:20240729T020000Z
diff --git a/docs/surfing/CAN.ics b/docs/surfing/CAN.ics
index ad212fc56..d8c5c016a 100644
--- a/docs/surfing/CAN.ics
+++ b/docs/surfing/CAN.ics
@@ -13,4 +13,13 @@ DESCRIPTION:Surfing - Women's Round 1 - Heat 3\n🇮🇱 Anat LELIOR\n🇨🇦
 SUMMARY:🏄 Women's Round 1 - Heat 3
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
+BEGIN:VEVENT
+UID:20240728T203600Z-surfing-WOMENS-ROUND-2-HEAT-7-BRA-CAN
+DTSTAMP:20240728T203600Z
+DTSTART:20240728T203600Z
+DTEND:20240728T210600Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 7
+SUMMARY:🏄 Taina HINCKEL 🇧🇷 - 🇨🇦 Sanoa DEMPFLE-OLIN
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/surfing/CHN.ics b/docs/surfing/CHN.ics
index 95db41b5b..a83be65d1 100644
--- a/docs/surfing/CHN.ics
+++ b/docs/surfing/CHN.ics
@@ -13,4 +13,13 @@ DESCRIPTION:Surfing - Women's Round 1 - Heat 7\n🇪🇸 Nadia EROSTARBE\n🇳
 SUMMARY:🏄 Women's Round 1 - Heat 7
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
+BEGIN:VEVENT
+UID:20240728T170000Z-surfing-WOMENS-ROUND-2-HEAT-1-PER-CHN
+DTSTAMP:20240728T170000Z
+DTSTART:20240728T170000Z
+DTEND:20240728T173000Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 1
+SUMMARY:🏄 Sol AGUIRRE 🇵🇪 - 🇨🇳 YANG Siqi
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/surfing/ESP.ics b/docs/surfing/ESP.ics
index af15ad1b2..fbf59a50f 100644
--- a/docs/surfing/ESP.ics
+++ b/docs/surfing/ESP.ics
@@ -34,6 +34,15 @@ SUMMARY:🏄 Women's Round 1 - Heat 7
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T211200Z-surfing-WOMENS-ROUND-2-HEAT-8-ISR-ESP
+DTSTAMP:20240728T211200Z
+DTSTART:20240728T211200Z
+DTEND:20240728T214200Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 8
+SUMMARY:🏄 Anat LELIOR 🇮🇱 - 🇪🇸 Janire GONZALEZ ETXABARRI
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T004800Z-surfing-MENS-ROUND-2-HEAT-6-MEX-ESP
 DTSTAMP:20240729T004800Z
 DTSTART:20240729T004800Z
diff --git a/docs/surfing/FRA.ics b/docs/surfing/FRA.ics
index b012f1fbb..0479b1522 100644
--- a/docs/surfing/FRA.ics
+++ b/docs/surfing/FRA.ics
@@ -44,6 +44,15 @@ SUMMARY:🏄 Women's Round 1 - Heat 5
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-FRA-AUS
+DTSTAMP:20240728T184800Z
+DTSTART:20240728T184800Z
+DTEND:20240728T191800Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 4
+SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇦🇺 Molly PICKLUM
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240728T233600Z-surfing-MENS-ROUND-2-HEAT-4-FRA-RSA
 DTSTAMP:20240728T233600Z
 DTSTART:20240728T233600Z
diff --git a/docs/surfing/GER.ics b/docs/surfing/GER.ics
index bee2b0399..25fd859bb 100644
--- a/docs/surfing/GER.ics
+++ b/docs/surfing/GER.ics
@@ -24,6 +24,15 @@ SUMMARY:🏄 Women's Round 1 - Heat 6
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T173600Z-surfing-WOMENS-ROUND-2-HEAT-2-RSA-GER
+DTSTAMP:20240728T173600Z
+DTSTART:20240728T173600Z
+DTEND:20240728T180600Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 2
+SUMMARY:🏄 Sarah BAUM 🇿🇦 - 🇩🇪 Camilla KEMP
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240728T222400Z-surfing-MENS-ROUND-2-HEAT-2-JPN-GER
 DTSTAMP:20240728T222400Z
 DTSTART:20240728T222400Z
diff --git a/docs/surfing/ISR.ics b/docs/surfing/ISR.ics
index 5a5580459..e1d4a5ba5 100644
--- a/docs/surfing/ISR.ics
+++ b/docs/surfing/ISR.ics
@@ -13,4 +13,13 @@ DESCRIPTION:Surfing - Women's Round 1 - Heat 3\n🇮🇱 Anat LELIOR\n🇨🇦
 SUMMARY:🏄 Women's Round 1 - Heat 3
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
+BEGIN:VEVENT
+UID:20240728T211200Z-surfing-WOMENS-ROUND-2-HEAT-8-ISR-ESP
+DTSTAMP:20240728T211200Z
+DTSTART:20240728T211200Z
+DTEND:20240728T214200Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 8
+SUMMARY:🏄 Anat LELIOR 🇮🇱 - 🇪🇸 Janire GONZALEZ ETXABARRI
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/surfing/JPN.ics b/docs/surfing/JPN.ics
index eafdd7643..1c5606639 100644
--- a/docs/surfing/JPN.ics
+++ b/docs/surfing/JPN.ics
@@ -44,6 +44,15 @@ SUMMARY:🏄 Women's Round 1 - Heat 8
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T181200Z-surfing-WOMENS-ROUND-2-HEAT-3-JPN-POR
+DTSTAMP:20240728T181200Z
+DTSTART:20240728T181200Z
+DTEND:20240728T184200Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 3
+SUMMARY:🏄 MATSUDA Shino 🇯🇵 - 🇵🇹 Teresa BONVALOT
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240728T214800Z-surfing-MENS-ROUND-2-HEAT-1-ITA-JPN
 DTSTAMP:20240728T214800Z
 DTSTART:20240728T214800Z
diff --git a/docs/surfing/NCA.ics b/docs/surfing/NCA.ics
index 1995d18d9..64ab94c6b 100644
--- a/docs/surfing/NCA.ics
+++ b/docs/surfing/NCA.ics
@@ -13,4 +13,13 @@ DESCRIPTION:Surfing - Women's Round 1 - Heat 5\n🇨🇷 Brisa HENNESSY\n🇳
 SUMMARY:🏄 Women's Round 1 - Heat 5
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
+BEGIN:VEVENT
+UID:20240728T192400Z-surfing-WOMENS-ROUND-2-HEAT-5-BRA-NCA
+DTSTAMP:20240728T192400Z
+DTSTART:20240728T192400Z
+DTEND:20240728T195400Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 5
+SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇳🇮 Candelaria RESANO
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/surfing/NZL.ics b/docs/surfing/NZL.ics
index 09fd67413..4a0b48885 100644
--- a/docs/surfing/NZL.ics
+++ b/docs/surfing/NZL.ics
@@ -24,6 +24,15 @@ SUMMARY:🏄 Women's Round 1 - Heat 7
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T200000Z-surfing-WOMENS-ROUND-2-HEAT-6-NZL-POR
+DTSTAMP:20240728T200000Z
+DTSTART:20240728T200000Z
+DTEND:20240728T203000Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 6
+SUMMARY:🏄 Saffi VETTE 🇳🇿 - 🇵🇹 Yolanda HOPKINS
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T020000Z-surfing-MENS-ROUND-2-HEAT-8-BRA-NZL
 DTSTAMP:20240729T020000Z
 DTSTART:20240729T020000Z
diff --git a/docs/surfing/PER.ics b/docs/surfing/PER.ics
index 86ffdbb50..86cb5783a 100644
--- a/docs/surfing/PER.ics
+++ b/docs/surfing/PER.ics
@@ -34,6 +34,15 @@ SUMMARY:🏄 Women's Round 1 - Heat 2
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T170000Z-surfing-WOMENS-ROUND-2-HEAT-1-PER-CHN
+DTSTAMP:20240728T170000Z
+DTSTART:20240728T170000Z
+DTEND:20240728T173000Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 1
+SUMMARY:🏄 Sol AGUIRRE 🇵🇪 - 🇨🇳 YANG Siqi
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T012400Z-surfing-MENS-ROUND-2-HEAT-7-AUS-PER
 DTSTAMP:20240729T012400Z
 DTSTART:20240729T012400Z
diff --git a/docs/surfing/POR.ics b/docs/surfing/POR.ics
index 665cd70a2..275324e6a 100644
--- a/docs/surfing/POR.ics
+++ b/docs/surfing/POR.ics
@@ -23,4 +23,22 @@ DESCRIPTION:Surfing - Women's Round 1 - Heat 8\n🇺🇸 Carissa MOORE\n🇯🇵
 SUMMARY:🏄 Women's Round 1 - Heat 8
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
+BEGIN:VEVENT
+UID:20240728T181200Z-surfing-WOMENS-ROUND-2-HEAT-3-JPN-POR
+DTSTAMP:20240728T181200Z
+DTSTART:20240728T181200Z
+DTEND:20240728T184200Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 3
+SUMMARY:🏄 MATSUDA Shino 🇯🇵 - 🇵🇹 Teresa BONVALOT
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
+UID:20240728T200000Z-surfing-WOMENS-ROUND-2-HEAT-6-NZL-POR
+DTSTAMP:20240728T200000Z
+DTSTART:20240728T200000Z
+DTEND:20240728T203000Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 6
+SUMMARY:🏄 Saffi VETTE 🇳🇿 - 🇵🇹 Yolanda HOPKINS
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/surfing/RSA.ics b/docs/surfing/RSA.ics
index 4609d3e82..f6455a7ba 100644
--- a/docs/surfing/RSA.ics
+++ b/docs/surfing/RSA.ics
@@ -34,6 +34,15 @@ SUMMARY:🏄 Women's Round 1 - Heat 1
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T173600Z-surfing-WOMENS-ROUND-2-HEAT-2-RSA-GER
+DTSTAMP:20240728T173600Z
+DTSTART:20240728T173600Z
+DTEND:20240728T180600Z
+DESCRIPTION:Surfing - Women's Round 2 - Heat 2
+SUMMARY:🏄 Sarah BAUM 🇿🇦 - 🇩🇪 Camilla KEMP
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240728T230000Z-surfing-MENS-ROUND-2-HEAT-3-RSA-INA
 DTSTAMP:20240728T230000Z
 DTSTART:20240728T230000Z
diff --git a/docs/surfing/general.ics b/docs/surfing/general.ics
index bcb7fc449..28a6d9e91 100644
--- a/docs/surfing/general.ics
+++ b/docs/surfing/general.ics
@@ -164,75 +164,75 @@ SUMMARY:🏄 Women's Round 1 - Heat 8
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T170000Z-surfing-WOMENS-ROUND-2-HEAT-1
+UID:20240728T170000Z-surfing-WOMENS-ROUND-2-HEAT-1-PER-CHN
 DTSTAMP:20240728T170000Z
 DTSTART:20240728T170000Z
 DTEND:20240728T173000Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 1
-SUMMARY:🏄 Women's Round 2 - Heat 1
+SUMMARY:🏄 Sol AGUIRRE 🇵🇪 - 🇨🇳 YANG Siqi
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T173600Z-surfing-WOMENS-ROUND-2-HEAT-2
+UID:20240728T173600Z-surfing-WOMENS-ROUND-2-HEAT-2-RSA-GER
 DTSTAMP:20240728T173600Z
 DTSTART:20240728T173600Z
 DTEND:20240728T180600Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 2
-SUMMARY:🏄 Women's Round 2 - Heat 2
+SUMMARY:🏄 Sarah BAUM 🇿🇦 - 🇩🇪 Camilla KEMP
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T181200Z-surfing-WOMENS-ROUND-2-HEAT-3
+UID:20240728T181200Z-surfing-WOMENS-ROUND-2-HEAT-3-JPN-POR
 DTSTAMP:20240728T181200Z
 DTSTART:20240728T181200Z
 DTEND:20240728T184200Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 3
-SUMMARY:🏄 Women's Round 2 - Heat 3
+SUMMARY:🏄 MATSUDA Shino 🇯🇵 - 🇵🇹 Teresa BONVALOT
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4
+UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-FRA-AUS
 DTSTAMP:20240728T184800Z
 DTSTART:20240728T184800Z
 DTEND:20240728T191800Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 4
-SUMMARY:🏄 Women's Round 2 - Heat 4
+SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇦🇺 Molly PICKLUM
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T192400Z-surfing-WOMENS-ROUND-2-HEAT-5
+UID:20240728T192400Z-surfing-WOMENS-ROUND-2-HEAT-5-BRA-NCA
 DTSTAMP:20240728T192400Z
 DTSTART:20240728T192400Z
 DTEND:20240728T195400Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 5
-SUMMARY:🏄 Women's Round 2 - Heat 5
+SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇳🇮 Candelaria RESANO
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T200000Z-surfing-WOMENS-ROUND-2-HEAT-6
+UID:20240728T200000Z-surfing-WOMENS-ROUND-2-HEAT-6-NZL-POR
 DTSTAMP:20240728T200000Z
 DTSTART:20240728T200000Z
 DTEND:20240728T203000Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 6
-SUMMARY:🏄 Women's Round 2 - Heat 6
+SUMMARY:🏄 Saffi VETTE 🇳🇿 - 🇵🇹 Yolanda HOPKINS
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T203600Z-surfing-WOMENS-ROUND-2-HEAT-7
+UID:20240728T203600Z-surfing-WOMENS-ROUND-2-HEAT-7-BRA-CAN
 DTSTAMP:20240728T203600Z
 DTSTART:20240728T203600Z
 DTEND:20240728T210600Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 7
-SUMMARY:🏄 Women's Round 2 - Heat 7
+SUMMARY:🏄 Taina HINCKEL 🇧🇷 - 🇨🇦 Sanoa DEMPFLE-OLIN
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T211200Z-surfing-WOMENS-ROUND-2-HEAT-8
+UID:20240728T211200Z-surfing-WOMENS-ROUND-2-HEAT-8-ISR-ESP
 DTSTAMP:20240728T211200Z
 DTSTART:20240728T211200Z
 DTEND:20240728T214200Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 8
-SUMMARY:🏄 Women's Round 2 - Heat 8
+SUMMARY:🏄 Anat LELIOR 🇮🇱 - 🇪🇸 Janire GONZALEZ ETXABARRI
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/today.html b/docs/today.html
index 287aa1a0d..98a303d1f 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -3606,7 +3606,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T020000Z" data-end="20240728T023000Z" data-noc="JPN,POR,USA">
+<div class="event py-4" data-start="20240728T020000Z" data-end="20240728T023000Z" data-noc="USA,JPN,POR">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center 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">SURFING</div>
@@ -7004,11 +7004,11 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T170000Z" data-end="20240728T173000Z" data-noc="">
+<div class="event py-4" data-start="20240728T170000Z" data-end="20240728T173000Z" data-noc="PER,CHN">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center 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">SURFING</div>
-   <div class="">Women's Round 2 - Heat 1
+   <div class="">Sol AGUIRRE 🇵🇪 - 🇨🇳 YANG Siqi
    </div>
  </div>
 </div>
@@ -7076,11 +7076,11 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T173600Z" data-end="20240728T180600Z" data-noc="">
+<div class="event py-4" data-start="20240728T173600Z" data-end="20240728T180600Z" data-noc="RSA,GER">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center 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">SURFING</div>
-   <div class="">Women's Round 2 - Heat 2
+   <div class="">Sarah BAUM 🇿🇦 - 🇩🇪 Camilla KEMP
    </div>
  </div>
 </div>
@@ -7156,11 +7156,11 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T181200Z" data-end="20240728T184200Z" data-noc="">
+<div class="event py-4" data-start="20240728T181200Z" data-end="20240728T184200Z" data-noc="JPN,POR">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center 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">SURFING</div>
-   <div class="">Women's Round 2 - Heat 3
+   <div class="">MATSUDA Shino 🇯🇵 - 🇵🇹 Teresa BONVALOT
    </div>
  </div>
 </div>
@@ -7268,11 +7268,11 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T184800Z" data-end="20240728T191800Z" data-noc="">
+<div class="event py-4" data-start="20240728T184800Z" data-end="20240728T191800Z" data-noc="FRA,AUS">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center 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">SURFING</div>
-   <div class="">Women's Round 2 - Heat 4
+   <div class="">Johanne DEFAY 🇫🇷 - 🇦🇺 Molly PICKLUM
    </div>
  </div>
 </div>
@@ -7444,11 +7444,11 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T192400Z" data-end="20240728T195400Z" data-noc="">
+<div class="event py-4" data-start="20240728T192400Z" data-end="20240728T195400Z" data-noc="BRA,NCA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center 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">SURFING</div>
-   <div class="">Women's Round 2 - Heat 5
+   <div class="">Tatiana WESTON-WEBB 🇧🇷 - 🇳🇮 Candelaria RESANO
    </div>
  </div>
 </div>
@@ -7524,11 +7524,11 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T200000Z" data-end="20240728T203000Z" data-noc="">
+<div class="event py-4" data-start="20240728T200000Z" data-end="20240728T203000Z" data-noc="NZL,POR">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center 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">SURFING</div>
-   <div class="">Women's Round 2 - Heat 6
+   <div class="">Saffi VETTE 🇳🇿 - 🇵🇹 Yolanda HOPKINS
    </div>
  </div>
 </div>
@@ -7572,19 +7572,19 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T203600Z" data-end="20240728T210600Z" data-noc="">
+<div class="event py-4" data-start="20240728T203600Z" data-end="20240728T210600Z" data-noc="BRA,CAN">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center 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">SURFING</div>
-   <div class="">Women's Round 2 - Heat 7
+   <div class="">Taina HINCKEL 🇧🇷 - 🇨🇦 Sanoa DEMPFLE-OLIN
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T211200Z" data-end="20240728T214200Z" data-noc="">
+<div class="event py-4" data-start="20240728T211200Z" data-end="20240728T214200Z" data-noc="ISR,ESP">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center 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">SURFING</div>
-   <div class="">Women's Round 2 - Heat 8
+   <div class="">Anat LELIOR 🇮🇱 - 🇪🇸 Janire GONZALEZ ETXABARRI
    </div>
  </div>
 </div>