diff --git a/docs/general/AUS.ics b/docs/general/AUS.ics
index 68138ff41..27abf2217 100644
--- a/docs/general/AUS.ics
+++ b/docs/general/AUS.ics
@@ -1260,6 +1260,15 @@ SUMMARY:🏐 NUSS/KLOTH 🇺🇸 - 🇦🇺 MARIAFE/CLANCY
 LOCATION:Eiffel Tower Stadium
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T222400Z-surfing-WOMENS-ROUND-3-HEAT-2-AUS-ISR
+DTSTAMP:20240729T222400Z
+DTSTART:20240729T222400Z
+DTEND:20240729T225400Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 2
+SUMMARY:🏄 Tyler WRIGHT 🇦🇺 - 🇮🇱 Anat LELIOR
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T060000Z-triathlon-MENS-INDIVIDUAL
 DTSTAMP:20240730T060000Z
 DTSTART:20240730T060000Z
diff --git a/docs/general/BRA.ics b/docs/general/BRA.ics
index c629cf67f..6069059ff 100644
--- a/docs/general/BRA.ics
+++ b/docs/general/BRA.ics
@@ -1201,6 +1201,24 @@ SUMMARY:🥊 Gerlon Gilmar CONGO CHALA 🇪🇨 - 🇧🇷 Abner TEIXEIRA da SIL
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240730T004800Z-surfing-WOMENS-ROUND-3-HEAT-6-USA-BRA
+DTSTAMP:20240730T004800Z
+DTSTART:20240730T004800Z
+DTEND:20240730T011800Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 6
+SUMMARY:🏄 Caitlin SIMMERS 🇺🇸 - 🇧🇷 Tatiana WESTON-WEBB
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
+UID:20240730T012400Z-surfing-WOMENS-ROUND-3-HEAT-7-BRA-BRA
+DTSTAMP:20240730T012400Z
+DTSTART:20240730T012400Z
+DTEND:20240730T015400Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 7
+SUMMARY:🏄 Luana SILVA 🇧🇷 - 🇧🇷 Taina HINCKEL
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T060000Z-triathlon-MENS-INDIVIDUAL
 DTSTAMP:20240730T060000Z
 DTSTART:20240730T060000Z
diff --git a/docs/general/CHN.ics b/docs/general/CHN.ics
index f62a0a77f..8b8d68781 100644
--- a/docs/general/CHN.ics
+++ b/docs/general/CHN.ics
@@ -1627,6 +1627,15 @@ SUMMARY:🏊 Women's 200m Freestyle Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T214800Z-surfing-WOMENS-ROUND-3-HEAT-1-USA-CHN
+DTSTAMP:20240729T214800Z
+DTSTART:20240729T214800Z
+DTEND:20240729T221800Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 1
+SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇨🇳 YANG Siqi
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T070000Z-shooting-TRAP-WOMENS-QUALIFICATION-DAY-1
 DTSTAMP:20240730T070000Z
 DTSTART:20240730T070000Z
diff --git a/docs/general/CRC.ics b/docs/general/CRC.ics
index b6d28bc5e..291a2a6c8 100644
--- a/docs/general/CRC.ics
+++ b/docs/general/CRC.ics
@@ -32,6 +32,15 @@ SUMMARY:🏄 Women's Round 1 - Heat 5
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
+UID:20240730T020000Z-surfing-WOMENS-ROUND-3-HEAT-8-CRC-POR
+DTSTAMP:20240730T020000Z
+DTSTART:20240730T020000Z
+DTEND:20240730T023000Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 8
+SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇵🇹 Yolanda HOPKINS
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240811T190000Z-closing-ceremony
 DTSTAMP:20240811T190000Z
 DTSTART:20240811T190000Z
diff --git a/docs/general/ESP.ics b/docs/general/ESP.ics
index 676911b2a..59b494bab 100644
--- a/docs/general/ESP.ics
+++ b/docs/general/ESP.ics
@@ -1250,6 +1250,15 @@ SUMMARY:🥊 Kamshybek KUNKABAYEV 🇰🇿 - 🇪🇸 Ayoub GHADFA DRISSI EL AIS
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240730T001200Z-surfing-WOMENS-ROUND-3-HEAT-5-ESP-JPN
+DTSTAMP:20240730T001200Z
+DTSTART:20240730T001200Z
+DTEND:20240730T004200Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 5
+SUMMARY:🏄 Nadia EROSTARBE 🇪🇸 - 🇯🇵 MATSUDA Shino
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T060000Z-triathlon-MENS-INDIVIDUAL
 DTSTAMP:20240730T060000Z
 DTSTART:20240730T060000Z
diff --git a/docs/general/FRA.ics b/docs/general/FRA.ics
index cecd54589..7b83f2d47 100644
--- a/docs/general/FRA.ics
+++ b/docs/general/FRA.ics
@@ -2096,6 +2096,15 @@ SUMMARY:🏓 Alexis LEBRUN 🇫🇷 - 🇭🇷 Tomislav PUCAR
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T230000Z-surfing-WOMENS-ROUND-3-HEAT-3-FRA-FRA
+DTSTAMP:20240729T230000Z
+DTSTART:20240729T230000Z
+DTEND:20240729T233000Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 3
+SUMMARY:🏄 Vahine FIERRO 🇫🇷 - 🇫🇷 Johanne DEFAY
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T060000Z-triathlon-MENS-INDIVIDUAL
 DTSTAMP:20240730T060000Z
 DTSTART:20240730T060000Z
diff --git a/docs/general/ISR.ics b/docs/general/ISR.ics
index e060e0e77..61f241af5 100644
--- a/docs/general/ISR.ics
+++ b/docs/general/ISR.ics
@@ -446,6 +446,15 @@ SUMMARY:🏸 Viktor AXELSEN 🇩🇰 - 🇮🇱 Misha ZILBERMAN
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T222400Z-surfing-WOMENS-ROUND-3-HEAT-2-AUS-ISR
+DTSTAMP:20240729T222400Z
+DTSTART:20240729T222400Z
+DTEND:20240729T225400Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 2
+SUMMARY:🏄 Tyler WRIGHT 🇦🇺 - 🇮🇱 Anat LELIOR
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T060000Z-triathlon-MENS-INDIVIDUAL
 DTSTAMP:20240730T060000Z
 DTSTART:20240730T060000Z
diff --git a/docs/general/JPN.ics b/docs/general/JPN.ics
index 12a15dfcf..019a2c4ea 100644
--- a/docs/general/JPN.ics
+++ b/docs/general/JPN.ics
@@ -1449,6 +1449,15 @@ SUMMARY:🏀 USA 🇺🇸 - 🇯🇵 JPN
 LOCATION:Pierre Mauroy Stadium
 END:VEVENT
 BEGIN:VEVENT
+UID:20240730T001200Z-surfing-WOMENS-ROUND-3-HEAT-5-ESP-JPN
+DTSTAMP:20240730T001200Z
+DTSTART:20240730T001200Z
+DTEND:20240730T004200Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 5
+SUMMARY:🏄 Nadia EROSTARBE 🇪🇸 - 🇯🇵 MATSUDA Shino
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T060000Z-triathlon-MENS-INDIVIDUAL
 DTSTAMP:20240730T060000Z
 DTSTART:20240730T060000Z
diff --git a/docs/general/POR.ics b/docs/general/POR.ics
index bb5246e3a..a828e687d 100644
--- a/docs/general/POR.ics
+++ b/docs/general/POR.ics
@@ -257,6 +257,15 @@ SUMMARY:🏓 Jieni SHAO 🇵🇹 - 🇦🇹 Sofia POLCANOVA
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240730T020000Z-surfing-WOMENS-ROUND-3-HEAT-8-CRC-POR
+DTSTAMP:20240730T020000Z
+DTSTART:20240730T020000Z
+DTEND:20240730T023000Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 8
+SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇵🇹 Yolanda HOPKINS
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T060000Z-triathlon-MENS-INDIVIDUAL
 DTSTAMP:20240730T060000Z
 DTSTART:20240730T060000Z
diff --git a/docs/general/RSA.ics b/docs/general/RSA.ics
index 3d6372942..1dcaf74a7 100644
--- a/docs/general/RSA.ics
+++ b/docs/general/RSA.ics
@@ -417,6 +417,15 @@ SUMMARY:🏊 Women's 100m Breaststroke Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T233600Z-surfing-WOMENS-ROUND-3-HEAT-4-USA-RSA
+DTSTAMP:20240729T233600Z
+DTSTART:20240729T233600Z
+DTEND:20240730T000600Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 4
+SUMMARY:🏄 Carissa MOORE 🇺🇸 - 🇿🇦 Sarah BAUM
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T060000Z-triathlon-MENS-INDIVIDUAL
 DTSTAMP:20240730T060000Z
 DTSTART:20240730T060000Z
diff --git a/docs/general/USA.ics b/docs/general/USA.ics
index 604f6dc5c..2bf41cfad 100644
--- a/docs/general/USA.ics
+++ b/docs/general/USA.ics
@@ -1873,6 +1873,33 @@ SUMMARY:🏓 Adriana DIAZ 🇵🇷 - 🇺🇸 Amy WANG
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T214800Z-surfing-WOMENS-ROUND-3-HEAT-1-USA-CHN
+DTSTAMP:20240729T214800Z
+DTSTART:20240729T214800Z
+DTEND:20240729T221800Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 1
+SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇨🇳 YANG Siqi
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
+UID:20240729T233600Z-surfing-WOMENS-ROUND-3-HEAT-4-USA-RSA
+DTSTAMP:20240729T233600Z
+DTSTART:20240729T233600Z
+DTEND:20240730T000600Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 4
+SUMMARY:🏄 Carissa MOORE 🇺🇸 - 🇿🇦 Sarah BAUM
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
+UID:20240730T004800Z-surfing-WOMENS-ROUND-3-HEAT-6-USA-BRA
+DTSTAMP:20240730T004800Z
+DTSTART:20240730T004800Z
+DTEND:20240730T011800Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 6
+SUMMARY:🏄 Caitlin SIMMERS 🇺🇸 - 🇧🇷 Tatiana WESTON-WEBB
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T060000Z-triathlon-MENS-INDIVIDUAL
 DTSTAMP:20240730T060000Z
 DTSTART:20240730T060000Z
diff --git a/docs/general/general.ics b/docs/general/general.ics
index 11bc41b9c..e3ff75fa6 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -11424,75 +11424,75 @@ SUMMARY:🏄 Men's Round 3 - Heat 8
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T214800Z-surfing-WOMENS-ROUND-3-HEAT-1
+UID:20240729T214800Z-surfing-WOMENS-ROUND-3-HEAT-1-USA-CHN
 DTSTAMP:20240729T214800Z
 DTSTART:20240729T214800Z
 DTEND:20240729T221800Z
 DESCRIPTION:Surfing - Women's Round 3 - Heat 1
-SUMMARY:🏄 Women's Round 3 - Heat 1
+SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇨🇳 YANG Siqi
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T222400Z-surfing-WOMENS-ROUND-3-HEAT-2
+UID:20240729T222400Z-surfing-WOMENS-ROUND-3-HEAT-2-AUS-ISR
 DTSTAMP:20240729T222400Z
 DTSTART:20240729T222400Z
 DTEND:20240729T225400Z
 DESCRIPTION:Surfing - Women's Round 3 - Heat 2
-SUMMARY:🏄 Women's Round 3 - Heat 2
+SUMMARY:🏄 Tyler WRIGHT 🇦🇺 - 🇮🇱 Anat LELIOR
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T230000Z-surfing-WOMENS-ROUND-3-HEAT-3
+UID:20240729T230000Z-surfing-WOMENS-ROUND-3-HEAT-3-FRA-FRA
 DTSTAMP:20240729T230000Z
 DTSTART:20240729T230000Z
 DTEND:20240729T233000Z
 DESCRIPTION:Surfing - Women's Round 3 - Heat 3
-SUMMARY:🏄 Women's Round 3 - Heat 3
+SUMMARY:🏄 Vahine FIERRO 🇫🇷 - 🇫🇷 Johanne DEFAY
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T233600Z-surfing-WOMENS-ROUND-3-HEAT-4
+UID:20240729T233600Z-surfing-WOMENS-ROUND-3-HEAT-4-USA-RSA
 DTSTAMP:20240729T233600Z
 DTSTART:20240729T233600Z
 DTEND:20240730T000600Z
 DESCRIPTION:Surfing - Women's Round 3 - Heat 4
-SUMMARY:🏄 Women's Round 3 - Heat 4
+SUMMARY:🏄 Carissa MOORE 🇺🇸 - 🇿🇦 Sarah BAUM
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T001200Z-surfing-WOMENS-ROUND-3-HEAT-5
+UID:20240730T001200Z-surfing-WOMENS-ROUND-3-HEAT-5-ESP-JPN
 DTSTAMP:20240730T001200Z
 DTSTART:20240730T001200Z
 DTEND:20240730T004200Z
 DESCRIPTION:Surfing - Women's Round 3 - Heat 5
-SUMMARY:🏄 Women's Round 3 - Heat 5
+SUMMARY:🏄 Nadia EROSTARBE 🇪🇸 - 🇯🇵 MATSUDA Shino
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T004800Z-surfing-WOMENS-ROUND-3-HEAT-6
+UID:20240730T004800Z-surfing-WOMENS-ROUND-3-HEAT-6-USA-BRA
 DTSTAMP:20240730T004800Z
 DTSTART:20240730T004800Z
 DTEND:20240730T011800Z
 DESCRIPTION:Surfing - Women's Round 3 - Heat 6
-SUMMARY:🏄 Women's Round 3 - Heat 6
+SUMMARY:🏄 Caitlin SIMMERS 🇺🇸 - 🇧🇷 Tatiana WESTON-WEBB
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T012400Z-surfing-WOMENS-ROUND-3-HEAT-7
+UID:20240730T012400Z-surfing-WOMENS-ROUND-3-HEAT-7-BRA-BRA
 DTSTAMP:20240730T012400Z
 DTSTART:20240730T012400Z
 DTEND:20240730T015400Z
 DESCRIPTION:Surfing - Women's Round 3 - Heat 7
-SUMMARY:🏄 Women's Round 3 - Heat 7
+SUMMARY:🏄 Luana SILVA 🇧🇷 - 🇧🇷 Taina HINCKEL
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T020000Z-surfing-WOMENS-ROUND-3-HEAT-8
+UID:20240730T020000Z-surfing-WOMENS-ROUND-3-HEAT-8-CRC-POR
 DTSTAMP:20240730T020000Z
 DTSTART:20240730T020000Z
 DTEND:20240730T023000Z
 DESCRIPTION:Surfing - Women's Round 3 - Heat 8
-SUMMARY:🏄 Women's Round 3 - Heat 8
+SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇵🇹 Yolanda HOPKINS
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/surfing/AUS.ics b/docs/surfing/AUS.ics
index edd876d5e..f34d2ba55 100644
--- a/docs/surfing/AUS.ics
+++ b/docs/surfing/AUS.ics
@@ -61,4 +61,13 @@ DESCRIPTION:Surfing - Men's Round 2 - Heat 7
 SUMMARY:🏄 Jack ROBINSON 🇦🇺 - 🇵🇪 Lucca MESINAS
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
+BEGIN:VEVENT
+UID:20240729T222400Z-surfing-WOMENS-ROUND-3-HEAT-2-AUS-ISR
+DTSTAMP:20240729T222400Z
+DTSTART:20240729T222400Z
+DTEND:20240729T225400Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 2
+SUMMARY:🏄 Tyler WRIGHT 🇦🇺 - 🇮🇱 Anat LELIOR
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/surfing/BRA.ics b/docs/surfing/BRA.ics
index 0e6a34687..694776703 100644
--- a/docs/surfing/BRA.ics
+++ b/docs/surfing/BRA.ics
@@ -80,4 +80,22 @@ DESCRIPTION:Surfing - Men's Round 2 - Heat 8
 SUMMARY:🏄 Filipe TOLEDO 🇧🇷 - 🇳🇿 Billy STAIRMAND
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
+BEGIN:VEVENT
+UID:20240730T004800Z-surfing-WOMENS-ROUND-3-HEAT-6-USA-BRA
+DTSTAMP:20240730T004800Z
+DTSTART:20240730T004800Z
+DTEND:20240730T011800Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 6
+SUMMARY:🏄 Caitlin SIMMERS 🇺🇸 - 🇧🇷 Tatiana WESTON-WEBB
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
+UID:20240730T012400Z-surfing-WOMENS-ROUND-3-HEAT-7-BRA-BRA
+DTSTAMP:20240730T012400Z
+DTSTART:20240730T012400Z
+DTEND:20240730T015400Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 7
+SUMMARY:🏄 Luana SILVA 🇧🇷 - 🇧🇷 Taina HINCKEL
+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 544e34d2b..ca1644f98 100644
--- a/docs/surfing/CHN.ics
+++ b/docs/surfing/CHN.ics
@@ -22,4 +22,13 @@ DESCRIPTION:Surfing - Women's Round 2 - Heat 1
 SUMMARY:🏄 YANG Siqi 🇨🇳 - 🇵🇪 Sol AGUIRRE
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
+BEGIN:VEVENT
+UID:20240729T214800Z-surfing-WOMENS-ROUND-3-HEAT-1-USA-CHN
+DTSTAMP:20240729T214800Z
+DTSTART:20240729T214800Z
+DTEND:20240729T221800Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 1
+SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇨🇳 YANG Siqi
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/surfing/CRC.ics b/docs/surfing/CRC.ics
index b76cf1d8c..852b4e2a3 100644
--- a/docs/surfing/CRC.ics
+++ b/docs/surfing/CRC.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:20240730T020000Z-surfing-WOMENS-ROUND-3-HEAT-8-CRC-POR
+DTSTAMP:20240730T020000Z
+DTSTART:20240730T020000Z
+DTEND:20240730T023000Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 8
+SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇵🇹 Yolanda HOPKINS
+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 fbf59a50f..5615672e0 100644
--- a/docs/surfing/ESP.ics
+++ b/docs/surfing/ESP.ics
@@ -51,4 +51,13 @@ DESCRIPTION:Surfing - Men's Round 2 - Heat 6
 SUMMARY:🏄 Alan CLELAND QUINONEZ 🇲🇽 - 🇪🇸 Andy CRIERE
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
+BEGIN:VEVENT
+UID:20240730T001200Z-surfing-WOMENS-ROUND-3-HEAT-5-ESP-JPN
+DTSTAMP:20240730T001200Z
+DTSTART:20240730T001200Z
+DTEND:20240730T004200Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 5
+SUMMARY:🏄 Nadia EROSTARBE 🇪🇸 - 🇯🇵 MATSUDA Shino
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/surfing/FRA.ics b/docs/surfing/FRA.ics
index 0479b1522..b6314a2f4 100644
--- a/docs/surfing/FRA.ics
+++ b/docs/surfing/FRA.ics
@@ -61,4 +61,13 @@ DESCRIPTION:Surfing - Men's Round 2 - Heat 4
 SUMMARY:🏄 Kauli VAAST 🇫🇷 - 🇿🇦 Matthew McGILLIVRAY
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
+BEGIN:VEVENT
+UID:20240729T230000Z-surfing-WOMENS-ROUND-3-HEAT-3-FRA-FRA
+DTSTAMP:20240729T230000Z
+DTSTART:20240729T230000Z
+DTEND:20240729T233000Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 3
+SUMMARY:🏄 Vahine FIERRO 🇫🇷 - 🇫🇷 Johanne DEFAY
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/surfing/ISR.ics b/docs/surfing/ISR.ics
index e1d4a5ba5..32c020768 100644
--- a/docs/surfing/ISR.ics
+++ b/docs/surfing/ISR.ics
@@ -22,4 +22,13 @@ DESCRIPTION:Surfing - Women's Round 2 - Heat 8
 SUMMARY:🏄 Anat LELIOR 🇮🇱 - 🇪🇸 Janire GONZALEZ ETXABARRI
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
+BEGIN:VEVENT
+UID:20240729T222400Z-surfing-WOMENS-ROUND-3-HEAT-2-AUS-ISR
+DTSTAMP:20240729T222400Z
+DTSTART:20240729T222400Z
+DTEND:20240729T225400Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 2
+SUMMARY:🏄 Tyler WRIGHT 🇦🇺 - 🇮🇱 Anat LELIOR
+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 1c5606639..79547eefe 100644
--- a/docs/surfing/JPN.ics
+++ b/docs/surfing/JPN.ics
@@ -70,4 +70,13 @@ DESCRIPTION:Surfing - Men's Round 2 - Heat 2
 SUMMARY:🏄 O'LEARY Connor 🇯🇵 - 🇩🇪 Tim ELTER
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
+BEGIN:VEVENT
+UID:20240730T001200Z-surfing-WOMENS-ROUND-3-HEAT-5-ESP-JPN
+DTSTAMP:20240730T001200Z
+DTSTART:20240730T001200Z
+DTEND:20240730T004200Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 5
+SUMMARY:🏄 Nadia EROSTARBE 🇪🇸 - 🇯🇵 MATSUDA Shino
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/surfing/POR.ics b/docs/surfing/POR.ics
index 661f04f97..4618dd4c3 100644
--- a/docs/surfing/POR.ics
+++ b/docs/surfing/POR.ics
@@ -41,4 +41,13 @@ DESCRIPTION:Surfing - Women's Round 2 - Heat 6
 SUMMARY:🏄 Yolanda HOPKINS 🇵🇹 - 🇳🇿 Saffi VETTE
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
+BEGIN:VEVENT
+UID:20240730T020000Z-surfing-WOMENS-ROUND-3-HEAT-8-CRC-POR
+DTSTAMP:20240730T020000Z
+DTSTART:20240730T020000Z
+DTEND:20240730T023000Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 8
+SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇵🇹 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 f6455a7ba..00cd338e8 100644
--- a/docs/surfing/RSA.ics
+++ b/docs/surfing/RSA.ics
@@ -60,4 +60,13 @@ DESCRIPTION:Surfing - Men's Round 2 - Heat 4
 SUMMARY:🏄 Kauli VAAST 🇫🇷 - 🇿🇦 Matthew McGILLIVRAY
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
+BEGIN:VEVENT
+UID:20240729T233600Z-surfing-WOMENS-ROUND-3-HEAT-4-USA-RSA
+DTSTAMP:20240729T233600Z
+DTSTART:20240729T233600Z
+DTEND:20240730T000600Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 4
+SUMMARY:🏄 Carissa MOORE 🇺🇸 - 🇿🇦 Sarah BAUM
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/surfing/USA.ics b/docs/surfing/USA.ics
index 08bcb9fba..22a8d3b52 100644
--- a/docs/surfing/USA.ics
+++ b/docs/surfing/USA.ics
@@ -53,4 +53,31 @@ 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:20240729T214800Z-surfing-WOMENS-ROUND-3-HEAT-1-USA-CHN
+DTSTAMP:20240729T214800Z
+DTSTART:20240729T214800Z
+DTEND:20240729T221800Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 1
+SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇨🇳 YANG Siqi
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
+UID:20240729T233600Z-surfing-WOMENS-ROUND-3-HEAT-4-USA-RSA
+DTSTAMP:20240729T233600Z
+DTSTART:20240729T233600Z
+DTEND:20240730T000600Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 4
+SUMMARY:🏄 Carissa MOORE 🇺🇸 - 🇿🇦 Sarah BAUM
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
+UID:20240730T004800Z-surfing-WOMENS-ROUND-3-HEAT-6-USA-BRA
+DTSTAMP:20240730T004800Z
+DTSTART:20240730T004800Z
+DTEND:20240730T011800Z
+DESCRIPTION:Surfing - Women's Round 3 - Heat 6
+SUMMARY:🏄 Caitlin SIMMERS 🇺🇸 - 🇧🇷 Tatiana WESTON-WEBB
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/surfing/general.ics b/docs/surfing/general.ics
index 251aac50d..b13a6df92 100644
--- a/docs/surfing/general.ics
+++ b/docs/surfing/general.ics
@@ -380,75 +380,75 @@ SUMMARY:🏄 Men's Round 3 - Heat 8
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T214800Z-surfing-WOMENS-ROUND-3-HEAT-1
+UID:20240729T214800Z-surfing-WOMENS-ROUND-3-HEAT-1-USA-CHN
 DTSTAMP:20240729T214800Z
 DTSTART:20240729T214800Z
 DTEND:20240729T221800Z
 DESCRIPTION:Surfing - Women's Round 3 - Heat 1
-SUMMARY:🏄 Women's Round 3 - Heat 1
+SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇨🇳 YANG Siqi
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T222400Z-surfing-WOMENS-ROUND-3-HEAT-2
+UID:20240729T222400Z-surfing-WOMENS-ROUND-3-HEAT-2-AUS-ISR
 DTSTAMP:20240729T222400Z
 DTSTART:20240729T222400Z
 DTEND:20240729T225400Z
 DESCRIPTION:Surfing - Women's Round 3 - Heat 2
-SUMMARY:🏄 Women's Round 3 - Heat 2
+SUMMARY:🏄 Tyler WRIGHT 🇦🇺 - 🇮🇱 Anat LELIOR
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T230000Z-surfing-WOMENS-ROUND-3-HEAT-3
+UID:20240729T230000Z-surfing-WOMENS-ROUND-3-HEAT-3-FRA-FRA
 DTSTAMP:20240729T230000Z
 DTSTART:20240729T230000Z
 DTEND:20240729T233000Z
 DESCRIPTION:Surfing - Women's Round 3 - Heat 3
-SUMMARY:🏄 Women's Round 3 - Heat 3
+SUMMARY:🏄 Vahine FIERRO 🇫🇷 - 🇫🇷 Johanne DEFAY
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T233600Z-surfing-WOMENS-ROUND-3-HEAT-4
+UID:20240729T233600Z-surfing-WOMENS-ROUND-3-HEAT-4-USA-RSA
 DTSTAMP:20240729T233600Z
 DTSTART:20240729T233600Z
 DTEND:20240730T000600Z
 DESCRIPTION:Surfing - Women's Round 3 - Heat 4
-SUMMARY:🏄 Women's Round 3 - Heat 4
+SUMMARY:🏄 Carissa MOORE 🇺🇸 - 🇿🇦 Sarah BAUM
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T001200Z-surfing-WOMENS-ROUND-3-HEAT-5
+UID:20240730T001200Z-surfing-WOMENS-ROUND-3-HEAT-5-ESP-JPN
 DTSTAMP:20240730T001200Z
 DTSTART:20240730T001200Z
 DTEND:20240730T004200Z
 DESCRIPTION:Surfing - Women's Round 3 - Heat 5
-SUMMARY:🏄 Women's Round 3 - Heat 5
+SUMMARY:🏄 Nadia EROSTARBE 🇪🇸 - 🇯🇵 MATSUDA Shino
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T004800Z-surfing-WOMENS-ROUND-3-HEAT-6
+UID:20240730T004800Z-surfing-WOMENS-ROUND-3-HEAT-6-USA-BRA
 DTSTAMP:20240730T004800Z
 DTSTART:20240730T004800Z
 DTEND:20240730T011800Z
 DESCRIPTION:Surfing - Women's Round 3 - Heat 6
-SUMMARY:🏄 Women's Round 3 - Heat 6
+SUMMARY:🏄 Caitlin SIMMERS 🇺🇸 - 🇧🇷 Tatiana WESTON-WEBB
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T012400Z-surfing-WOMENS-ROUND-3-HEAT-7
+UID:20240730T012400Z-surfing-WOMENS-ROUND-3-HEAT-7-BRA-BRA
 DTSTAMP:20240730T012400Z
 DTSTART:20240730T012400Z
 DTEND:20240730T015400Z
 DESCRIPTION:Surfing - Women's Round 3 - Heat 7
-SUMMARY:🏄 Women's Round 3 - Heat 7
+SUMMARY:🏄 Luana SILVA 🇧🇷 - 🇧🇷 Taina HINCKEL
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T020000Z-surfing-WOMENS-ROUND-3-HEAT-8
+UID:20240730T020000Z-surfing-WOMENS-ROUND-3-HEAT-8-CRC-POR
 DTSTAMP:20240730T020000Z
 DTSTART:20240730T020000Z
 DTEND:20240730T023000Z
 DESCRIPTION:Surfing - Women's Round 3 - Heat 8
-SUMMARY:🏄 Women's Round 3 - Heat 8
+SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇵🇹 Yolanda HOPKINS
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/today.html b/docs/today.html
index 0d5e2d8f4..05509da83 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -16022,7 +16022,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T214800Z" data-end="20240729T221800Z" data-noc="">
+<div class="event py-4" data-start="20240729T214800Z" data-end="20240729T221800Z" data-noc="USA,CHN">
  <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">
@@ -16030,11 +16030,11 @@
    SURFING
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
-   <div class="">Women's Round 3 - Heat 1
+   <div class="">Caroline MARKS 🇺🇸 - 🇨🇳 YANG Siqi
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T222400Z" data-end="20240729T225400Z" data-noc="">
+<div class="event py-4" data-start="20240729T222400Z" data-end="20240729T225400Z" data-noc="AUS,ISR">
  <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">
@@ -16042,11 +16042,11 @@
    SURFING
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
-   <div class="">Women's Round 3 - Heat 2
+   <div class="">Tyler WRIGHT 🇦🇺 - 🇮🇱 Anat LELIOR
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T230000Z" data-end="20240729T233000Z" data-noc="">
+<div class="event py-4" data-start="20240729T230000Z" data-end="20240729T233000Z" data-noc="FRA,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">
    <div class="text-2xl">
@@ -16054,11 +16054,11 @@
    SURFING
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
-   <div class="">Women's Round 3 - Heat 3
+   <div class="">Vahine FIERRO 🇫🇷 - 🇫🇷 Johanne DEFAY
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T233600Z" data-end="20240730T000600Z" data-noc="">
+<div class="event py-4" data-start="20240729T233600Z" data-end="20240730T000600Z" data-noc="USA,RSA">
  <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">
@@ -16066,11 +16066,11 @@
    SURFING
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
-   <div class="">Women's Round 3 - Heat 4
+   <div class="">Carissa MOORE 🇺🇸 - 🇿🇦 Sarah BAUM
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240730T001200Z" data-end="20240730T004200Z" data-noc="">
+<div class="event py-4" data-start="20240730T001200Z" data-end="20240730T004200Z" data-noc="ESP,JPN">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -16078,11 +16078,11 @@
    SURFING
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
-   <div class="">Women's Round 3 - Heat 5
+   <div class="">Nadia EROSTARBE 🇪🇸 - 🇯🇵 MATSUDA Shino
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240730T004800Z" data-end="20240730T011800Z" data-noc="">
+<div class="event py-4" data-start="20240730T004800Z" data-end="20240730T011800Z" data-noc="USA,BRA">
  <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">
@@ -16090,11 +16090,11 @@
    SURFING
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
-   <div class="">Women's Round 3 - Heat 6
+   <div class="">Caitlin SIMMERS 🇺🇸 - 🇧🇷 Tatiana WESTON-WEBB
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240730T012400Z" data-end="20240730T015400Z" data-noc="">
+<div class="event py-4" data-start="20240730T012400Z" data-end="20240730T015400Z" data-noc="BRA,BRA">
  <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">
@@ -16102,11 +16102,11 @@
    SURFING
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
-   <div class="">Women's Round 3 - Heat 7
+   <div class="">Luana SILVA 🇧🇷 - 🇧🇷 Taina HINCKEL
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240730T020000Z" data-end="20240730T023000Z" data-noc="">
+<div class="event py-4" data-start="20240730T020000Z" data-end="20240730T023000Z" data-noc="CRC,POR">
  <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">
@@ -16114,7 +16114,7 @@
    SURFING
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
-   <div class="">Women's Round 3 - Heat 8
+   <div class="">Brisa HENNESSY 🇨🇷 - 🇵🇹 Yolanda HOPKINS
    </div>
  </div>
 </div>