diff --git a/docs/en/general/BRA.ics b/docs/en/general/BRA.ics
index 96bc8d3af..f1b00ca8a 100644
--- a/docs/en/general/BRA.ics
+++ b/docs/en/general/BRA.ics
@@ -2488,7 +2488,7 @@ BEGIN:VEVENT
 UID:20240902T100000Z-wheelchair-tennis-MENS-SINGLES-THIRD-ROUND-BRA-JPN
 DTSTAMP:20240902T100000Z
 DTSTART:20240902T100000Z
-DTEND:20240902T160000Z
+DTEND:20240902T173000Z
 DESCRIPTION:Wheelchair Tennis - Men's Singles Third Round
 SUMMARY: Daniel RODRIGUES 🇧🇷 - 🇯🇵 ODA Tokito
 LOCATION:Roland-Garros Stadium
diff --git a/docs/en/general/CHN.ics b/docs/en/general/CHN.ics
index 1883c4640..a075c9446 100644
--- a/docs/en/general/CHN.ics
+++ b/docs/en/general/CHN.ics
@@ -4797,6 +4797,15 @@ SUMMARY:Women's up to 45kg Final
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240904T160000Z-goalball-MENS-SEMIFINAL
+DTSTAMP:20240904T160000Z
+DTSTART:20240904T160000Z
+DTEND:20240904T170000Z
+DESCRIPTION:Goalball - Men's Semifinal\n🇨🇳 CHN
+SUMMARY:Men's Semifinal
+LOCATION:South Paris Arena 6
+END:VEVENT
+BEGIN:VEVENT
 UID:20240904T163500Z-para-powerlifting-MENS-UP-TO-54KG-FINAL
 DTSTAMP:20240904T163500Z
 DTSTART:20240904T163500Z
diff --git a/docs/en/general/IND.ics b/docs/en/general/IND.ics
index e88a5eb62..4ad693fbf 100644
--- a/docs/en/general/IND.ics
+++ b/docs/en/general/IND.ics
@@ -1129,6 +1129,15 @@ SUMMARY:Women's Discus Throw - F53 Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T170500Z-para-archery-MIXED-TEAM-COMPOUND-OPEN-BRONZE-MEDAL
+DTSTAMP:20240902T170500Z
+DTSTART:20240902T170500Z
+DTEND:20240902T172500Z
+DESCRIPTION:Para Archery - Mixed Team Compound Open Bronze Medal\n🇮🇳 IND
+SUMMARY:Mixed Team Compound Open Bronze Medal
+LOCATION:Invalides
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T182000Z-para-athletics-WOMENS-400M-T20-ROUND-1
 DTSTAMP:20240902T182000Z
 DTSTART:20240902T182000Z
diff --git a/docs/en/general/IRI.ics b/docs/en/general/IRI.ics
index 16bd102bc..89db2b7a5 100644
--- a/docs/en/general/IRI.ics
+++ b/docs/en/general/IRI.ics
@@ -543,6 +543,16 @@ SUMMARY: IND 🇮🇳 - 🇮🇷 IRI
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T172500Z-para-archery-MIXED-TEAM-COMPOUND-OPEN-GOLD-MEDAL
+DTSTAMP:20240902T172500Z
+DTSTART:20240902T172500Z
+DTEND:20240902T174500Z
+DESCRIPTION:Para Archery - Mixed Team Compound Open Gold Medal\n🇮🇷 IR
+  Iran
+SUMMARY:Mixed Team Compound Open Gold Medal
+LOCATION:Invalides
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T183500Z-para-athletics-MENS-SHOT-PUT-F11-FINAL
 DTSTAMP:20240902T183500Z
 DTSTART:20240902T183500Z
diff --git a/docs/en/general/JPN.ics b/docs/en/general/JPN.ics
index 8bc3ed6d9..393c19ea0 100644
--- a/docs/en/general/JPN.ics
+++ b/docs/en/general/JPN.ics
@@ -2131,15 +2131,6 @@ SUMMARY: Alfie HEWETT 🇬🇧 - 🇯🇵 ARAI Daisuke
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T100000Z-wheelchair-tennis-MENS-SINGLES-THIRD-ROUND-BRA-JPN
-DTSTAMP:20240902T100000Z
-DTSTART:20240902T100000Z
-DTEND:20240902T160000Z
-DESCRIPTION:Wheelchair Tennis - Men's Singles Third Round
-SUMMARY: Daniel RODRIGUES 🇧🇷 - 🇯🇵 ODA Tokito
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
 UID:20240902T100000Z-wheelchair-tennis-MENS-SINGLES-THIRD-ROUND-JPN-FRA
 DTSTAMP:20240902T100000Z
 DTSTART:20240902T100000Z
@@ -2149,6 +2140,15 @@ SUMMARY: SANADA Takashi 🇯🇵 - 🇫🇷 Stephane HOUDET
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T100000Z-wheelchair-tennis-MENS-SINGLES-THIRD-ROUND-BRA-JPN
+DTSTAMP:20240902T100000Z
+DTSTART:20240902T100000Z
+DTEND:20240902T173000Z
+DESCRIPTION:Wheelchair Tennis - Men's Singles Third Round
+SUMMARY: Daniel RODRIGUES 🇧🇷 - 🇯🇵 ODA Tokito
+LOCATION:Roland-Garros Stadium
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T102500Z-para-triathlon-MENS-PTS4
 DTSTAMP:20240902T102500Z
 DTSTART:20240902T102500Z
diff --git a/docs/en/general/general.ics b/docs/en/general/general.ics
index a0fd36fab..3d15df077 100644
--- a/docs/en/general/general.ics
+++ b/docs/en/general/general.ics
@@ -13630,15 +13630,6 @@ SUMMARY: Alfie HEWETT 🇬🇧 - 🇯🇵 ARAI Daisuke
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T100000Z-wheelchair-tennis-MENS-SINGLES-THIRD-ROUND-BRA-JPN
-DTSTAMP:20240902T100000Z
-DTSTART:20240902T100000Z
-DTEND:20240902T160000Z
-DESCRIPTION:Wheelchair Tennis - Men's Singles Third Round
-SUMMARY: Daniel RODRIGUES 🇧🇷 - 🇯🇵 ODA Tokito
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
 UID:20240902T100000Z-wheelchair-tennis-MENS-SINGLES-THIRD-ROUND-JPN-FRA
 DTSTAMP:20240902T100000Z
 DTSTART:20240902T100000Z
@@ -13648,6 +13639,15 @@ SUMMARY: SANADA Takashi 🇯🇵 - 🇫🇷 Stephane HOUDET
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T100000Z-wheelchair-tennis-MENS-SINGLES-THIRD-ROUND-BRA-JPN
+DTSTAMP:20240902T100000Z
+DTSTART:20240902T100000Z
+DTEND:20240902T173000Z
+DESCRIPTION:Wheelchair Tennis - Men's Singles Third Round
+SUMMARY: Daniel RODRIGUES 🇧🇷 - 🇯🇵 ODA Tokito
+LOCATION:Roland-Garros Stadium
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T100500Z-para-triathlon-WOMENS-PTVI
 DTSTAMP:20240902T100500Z
 DTSTART:20240902T100500Z
@@ -14539,7 +14539,7 @@ UID:20240902T170500Z-para-archery-MIXED-TEAM-COMPOUND-OPEN-BRONZE-MEDAL
 DTSTAMP:20240902T170500Z
 DTSTART:20240902T170500Z
 DTEND:20240902T172500Z
-DESCRIPTION:Para Archery - Mixed Team Compound Open Bronze Medal
+DESCRIPTION:Para Archery - Mixed Team Compound Open Bronze Medal\n🇮🇳 IND
 SUMMARY:Mixed Team Compound Open Bronze Medal
 LOCATION:Invalides
 END:VEVENT
@@ -14670,7 +14670,8 @@ UID:20240902T172500Z-para-archery-MIXED-TEAM-COMPOUND-OPEN-GOLD-MEDAL
 DTSTAMP:20240902T172500Z
 DTSTART:20240902T172500Z
 DTEND:20240902T174500Z
-DESCRIPTION:Para Archery - Mixed Team Compound Open Gold Medal
+DESCRIPTION:Para Archery - Mixed Team Compound Open Gold Medal\n🇮🇷 IR
+  Iran
 SUMMARY:Mixed Team Compound Open Gold Medal
 LOCATION:Invalides
 END:VEVENT
@@ -20501,6 +20502,15 @@ SUMMARY: CHEN Po Yen 🇹🇼 - 🇧🇪 Florian van ACKER
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240904T160000Z-goalball-MENS-SEMIFINAL
+DTSTAMP:20240904T160000Z
+DTSTART:20240904T160000Z
+DTEND:20240904T170000Z
+DESCRIPTION:Goalball - Men's Semifinal\n🇨🇳 CHN
+SUMMARY:Men's Semifinal
+LOCATION:South Paris Arena 6
+END:VEVENT
+BEGIN:VEVENT
 UID:20240904T160000Z-para-table-tennis-MENS-SINGLES-MS2-SEMIFINAL-2
 DTSTAMP:20240904T160000Z
 DTSTART:20240904T160000Z
@@ -20528,15 +20538,6 @@ SUMMARY:Men's Singles - MS8 - Quarterfinal 2
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240904T160000Z-goalball-MENS-SEMIFINAL
-DTSTAMP:20240904T160000Z
-DTSTART:20240904T160000Z
-DTEND:20240904T171500Z
-DESCRIPTION:Goalball - Men's Semifinal
-SUMMARY:Men's Semifinal
-LOCATION:South Paris Arena 6
-END:VEVENT
-BEGIN:VEVENT
 UID:20240904T160000Z-sitting-volleyball-WOMENS-CLASSIFICATION-5-6
 DTSTAMP:20240904T160000Z
 DTSTART:20240904T160000Z
diff --git a/docs/en/goalball/CHN.ics b/docs/en/goalball/CHN.ics
index 553c5f9fe..aaac52621 100644
--- a/docs/en/goalball/CHN.ics
+++ b/docs/en/goalball/CHN.ics
@@ -75,4 +75,13 @@ DESCRIPTION:Goalball - Women's Quarterfinal
 SUMMARY: CHN 🇨🇳 - 🇫🇷 FRA
 LOCATION:South Paris Arena 6
 END:VEVENT
+BEGIN:VEVENT
+UID:20240904T160000Z-goalball-MENS-SEMIFINAL
+DTSTAMP:20240904T160000Z
+DTSTART:20240904T160000Z
+DTEND:20240904T170000Z
+DESCRIPTION:Goalball - Men's Semifinal\n🇨🇳 CHN
+SUMMARY:Men's Semifinal
+LOCATION:South Paris Arena 6
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/goalball/general.ics b/docs/en/goalball/general.ics
index f909ed8f9..b942e1e6f 100644
--- a/docs/en/goalball/general.ics
+++ b/docs/en/goalball/general.ics
@@ -349,8 +349,8 @@ BEGIN:VEVENT
 UID:20240904T160000Z-goalball-MENS-SEMIFINAL
 DTSTAMP:20240904T160000Z
 DTSTART:20240904T160000Z
-DTEND:20240904T171500Z
-DESCRIPTION:Goalball - Men's Semifinal
+DTEND:20240904T170000Z
+DESCRIPTION:Goalball - Men's Semifinal\n🇨🇳 CHN
 SUMMARY:Men's Semifinal
 LOCATION:South Paris Arena 6
 END:VEVENT
diff --git a/docs/en/medals/IND.ics b/docs/en/medals/IND.ics
index ed0a589fe..73c1fa819 100644
--- a/docs/en/medals/IND.ics
+++ b/docs/en/medals/IND.ics
@@ -225,6 +225,15 @@ SUMMARY:Women's Discus Throw - F53 Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T170500Z-para-archery-MIXED-TEAM-COMPOUND-OPEN-BRONZE-MEDAL
+DTSTAMP:20240902T170500Z
+DTSTART:20240902T170500Z
+DTEND:20240902T172500Z
+DESCRIPTION:Para Archery - Mixed Team Compound Open Bronze Medal\n🇮🇳 IND
+SUMMARY:Mixed Team Compound Open Bronze Medal
+LOCATION:Invalides
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T182000Z-para-badminton-WOMENS-SINGLES-SH6-BRONZE-MEDAL-MATCH-I
 DTSTAMP:20240902T182000Z
 DTSTART:20240902T182000Z
diff --git a/docs/en/medals/IRI.ics b/docs/en/medals/IRI.ics
index 9b7102051..3d07fecdb 100644
--- a/docs/en/medals/IRI.ics
+++ b/docs/en/medals/IRI.ics
@@ -146,6 +146,16 @@ SUMMARY:Women's Shot Put - F54 Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T172500Z-para-archery-MIXED-TEAM-COMPOUND-OPEN-GOLD-MEDAL
+DTSTAMP:20240902T172500Z
+DTSTART:20240902T172500Z
+DTEND:20240902T174500Z
+DESCRIPTION:Para Archery - Mixed Team Compound Open Gold Medal\n🇮🇷 IR
+  Iran
+SUMMARY:Mixed Team Compound Open Gold Medal
+LOCATION:Invalides
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T183500Z-para-athletics-MENS-SHOT-PUT-F11-FINAL
 DTSTAMP:20240902T183500Z
 DTSTART:20240902T183500Z
diff --git a/docs/en/medals/general.ics b/docs/en/medals/general.ics
index cbfe3b54d..4f7406f20 100644
--- a/docs/en/medals/general.ics
+++ b/docs/en/medals/general.ics
@@ -3094,7 +3094,7 @@ UID:20240902T170500Z-para-archery-MIXED-TEAM-COMPOUND-OPEN-BRONZE-MEDAL
 DTSTAMP:20240902T170500Z
 DTSTART:20240902T170500Z
 DTEND:20240902T172500Z
-DESCRIPTION:Para Archery - Mixed Team Compound Open Bronze Medal
+DESCRIPTION:Para Archery - Mixed Team Compound Open Bronze Medal\n🇮🇳 IND
 SUMMARY:Mixed Team Compound Open Bronze Medal
 LOCATION:Invalides
 END:VEVENT
@@ -3149,7 +3149,8 @@ UID:20240902T172500Z-para-archery-MIXED-TEAM-COMPOUND-OPEN-GOLD-MEDAL
 DTSTAMP:20240902T172500Z
 DTSTART:20240902T172500Z
 DTEND:20240902T174500Z
-DESCRIPTION:Para Archery - Mixed Team Compound Open Gold Medal
+DESCRIPTION:Para Archery - Mixed Team Compound Open Gold Medal\n🇮🇷 IR
+  Iran
 SUMMARY:Mixed Team Compound Open Gold Medal
 LOCATION:Invalides
 END:VEVENT
diff --git a/docs/en/para-archery/IND.ics b/docs/en/para-archery/IND.ics
index b49bc32ed..c2dd6766f 100644
--- a/docs/en/para-archery/IND.ics
+++ b/docs/en/para-archery/IND.ics
@@ -189,6 +189,15 @@ SUMMARY: IND 🇮🇳 - 🇮🇷 IRI
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T170500Z-para-archery-MIXED-TEAM-COMPOUND-OPEN-BRONZE-MEDAL
+DTSTAMP:20240902T170500Z
+DTSTART:20240902T170500Z
+DTEND:20240902T172500Z
+DESCRIPTION:Para Archery - Mixed Team Compound Open Bronze Medal\n🇮🇳 IND
+SUMMARY:Mixed Team Compound Open Bronze Medal
+LOCATION:Invalides
+END:VEVENT
+BEGIN:VEVENT
 UID:20240903T095000Z-para-archery-WOMENS-INDIVIDUAL-RECURVE-OPEN-18-ELIMINA
 DTSTAMP:20240903T095000Z
 DTSTART:20240903T095000Z
diff --git a/docs/en/para-archery/IRI.ics b/docs/en/para-archery/IRI.ics
index 3329e9a5a..4cea5d45b 100644
--- a/docs/en/para-archery/IRI.ics
+++ b/docs/en/para-archery/IRI.ics
@@ -161,6 +161,16 @@ SUMMARY: IND 🇮🇳 - 🇮🇷 IRI
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T172500Z-para-archery-MIXED-TEAM-COMPOUND-OPEN-GOLD-MEDAL
+DTSTAMP:20240902T172500Z
+DTSTART:20240902T172500Z
+DTEND:20240902T174500Z
+DESCRIPTION:Para Archery - Mixed Team Compound Open Gold Medal\n🇮🇷 IR
+  Iran
+SUMMARY:Mixed Team Compound Open Gold Medal
+LOCATION:Invalides
+END:VEVENT
+BEGIN:VEVENT
 UID:20240903T070000Z-para-archery-WOMENS-INDIVIDUAL-RECURVE-OPEN-116-ELIMIN
 DTSTAMP:20240903T070000Z
 DTSTART:20240903T070000Z
diff --git a/docs/en/para-archery/general.ics b/docs/en/para-archery/general.ics
index 97445c12c..250539f05 100644
--- a/docs/en/para-archery/general.ics
+++ b/docs/en/para-archery/general.ics
@@ -1031,7 +1031,7 @@ UID:20240902T170500Z-para-archery-MIXED-TEAM-COMPOUND-OPEN-BRONZE-MEDAL
 DTSTAMP:20240902T170500Z
 DTSTART:20240902T170500Z
 DTEND:20240902T172500Z
-DESCRIPTION:Para Archery - Mixed Team Compound Open Bronze Medal
+DESCRIPTION:Para Archery - Mixed Team Compound Open Bronze Medal\n🇮🇳 IND
 SUMMARY:Mixed Team Compound Open Bronze Medal
 LOCATION:Invalides
 END:VEVENT
@@ -1040,7 +1040,8 @@ UID:20240902T172500Z-para-archery-MIXED-TEAM-COMPOUND-OPEN-GOLD-MEDAL
 DTSTAMP:20240902T172500Z
 DTSTART:20240902T172500Z
 DTEND:20240902T174500Z
-DESCRIPTION:Para Archery - Mixed Team Compound Open Gold Medal
+DESCRIPTION:Para Archery - Mixed Team Compound Open Gold Medal\n🇮🇷 IR
+  Iran
 SUMMARY:Mixed Team Compound Open Gold Medal
 LOCATION:Invalides
 END:VEVENT
diff --git a/docs/en/para-archery/medals.ics b/docs/en/para-archery/medals.ics
index f957008d1..441b2ce8b 100644
--- a/docs/en/para-archery/medals.ics
+++ b/docs/en/para-archery/medals.ics
@@ -98,7 +98,7 @@ UID:20240902T170500Z-para-archery-MIXED-TEAM-COMPOUND-OPEN-BRONZE-MEDAL
 DTSTAMP:20240902T170500Z
 DTSTART:20240902T170500Z
 DTEND:20240902T172500Z
-DESCRIPTION:Para Archery - Mixed Team Compound Open Bronze Medal
+DESCRIPTION:Para Archery - Mixed Team Compound Open Bronze Medal\n🇮🇳 IND
 SUMMARY:Mixed Team Compound Open Bronze Medal
 LOCATION:Invalides
 END:VEVENT
@@ -107,7 +107,8 @@ UID:20240902T172500Z-para-archery-MIXED-TEAM-COMPOUND-OPEN-GOLD-MEDAL
 DTSTAMP:20240902T172500Z
 DTSTART:20240902T172500Z
 DTEND:20240902T174500Z
-DESCRIPTION:Para Archery - Mixed Team Compound Open Gold Medal
+DESCRIPTION:Para Archery - Mixed Team Compound Open Gold Medal\n🇮🇷 IR
+  Iran
 SUMMARY:Mixed Team Compound Open Gold Medal
 LOCATION:Invalides
 END:VEVENT
diff --git a/docs/en/wheelchair-tennis/BRA.ics b/docs/en/wheelchair-tennis/BRA.ics
index c2d232d33..c1ed9c063 100644
--- a/docs/en/wheelchair-tennis/BRA.ics
+++ b/docs/en/wheelchair-tennis/BRA.ics
@@ -97,7 +97,7 @@ BEGIN:VEVENT
 UID:20240902T100000Z-wheelchair-tennis-MENS-SINGLES-THIRD-ROUND-BRA-JPN
 DTSTAMP:20240902T100000Z
 DTSTART:20240902T100000Z
-DTEND:20240902T160000Z
+DTEND:20240902T173000Z
 DESCRIPTION:Wheelchair Tennis - Men's Singles Third Round
 SUMMARY: Daniel RODRIGUES 🇧🇷 - 🇯🇵 ODA Tokito
 LOCATION:Roland-Garros Stadium
diff --git a/docs/en/wheelchair-tennis/JPN.ics b/docs/en/wheelchair-tennis/JPN.ics
index 539d12a0d..5fc70b78d 100644
--- a/docs/en/wheelchair-tennis/JPN.ics
+++ b/docs/en/wheelchair-tennis/JPN.ics
@@ -175,15 +175,6 @@ SUMMARY: Alfie HEWETT 🇬🇧 - 🇯🇵 ARAI Daisuke
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T100000Z-wheelchair-tennis-MENS-SINGLES-THIRD-ROUND-BRA-JPN
-DTSTAMP:20240902T100000Z
-DTSTART:20240902T100000Z
-DTEND:20240902T160000Z
-DESCRIPTION:Wheelchair Tennis - Men's Singles Third Round
-SUMMARY: Daniel RODRIGUES 🇧🇷 - 🇯🇵 ODA Tokito
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
 UID:20240902T100000Z-wheelchair-tennis-MENS-SINGLES-THIRD-ROUND-JPN-FRA
 DTSTAMP:20240902T100000Z
 DTSTART:20240902T100000Z
@@ -193,6 +184,15 @@ SUMMARY: SANADA Takashi 🇯🇵 - 🇫🇷 Stephane HOUDET
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T100000Z-wheelchair-tennis-MENS-SINGLES-THIRD-ROUND-BRA-JPN
+DTSTAMP:20240902T100000Z
+DTSTART:20240902T100000Z
+DTEND:20240902T173000Z
+DESCRIPTION:Wheelchair Tennis - Men's Singles Third Round
+SUMMARY: Daniel RODRIGUES 🇧🇷 - 🇯🇵 ODA Tokito
+LOCATION:Roland-Garros Stadium
+END:VEVENT
+BEGIN:VEVENT
 UID:20240903T100000Z-wheelchair-tennis-WOMENS-SINGLES-QUARTER-FINAL-CHN-JPN
 DTSTAMP:20240903T100000Z
 DTSTART:20240903T100000Z
diff --git a/docs/en/wheelchair-tennis/general.ics b/docs/en/wheelchair-tennis/general.ics
index 021a0dcbc..ff8d6d9cf 100644
--- a/docs/en/wheelchair-tennis/general.ics
+++ b/docs/en/wheelchair-tennis/general.ics
@@ -877,15 +877,6 @@ SUMMARY: Alfie HEWETT 🇬🇧 - 🇯🇵 ARAI Daisuke
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T100000Z-wheelchair-tennis-MENS-SINGLES-THIRD-ROUND-BRA-JPN
-DTSTAMP:20240902T100000Z
-DTSTART:20240902T100000Z
-DTEND:20240902T160000Z
-DESCRIPTION:Wheelchair Tennis - Men's Singles Third Round
-SUMMARY: Daniel RODRIGUES 🇧🇷 - 🇯🇵 ODA Tokito
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
 UID:20240902T100000Z-wheelchair-tennis-MENS-SINGLES-THIRD-ROUND-JPN-FRA
 DTSTAMP:20240902T100000Z
 DTSTART:20240902T100000Z
@@ -895,6 +886,15 @@ SUMMARY: SANADA Takashi 🇯🇵 - 🇫🇷 Stephane HOUDET
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T100000Z-wheelchair-tennis-MENS-SINGLES-THIRD-ROUND-BRA-JPN
+DTSTAMP:20240902T100000Z
+DTSTART:20240902T100000Z
+DTEND:20240902T173000Z
+DESCRIPTION:Wheelchair Tennis - Men's Singles Third Round
+SUMMARY: Daniel RODRIGUES 🇧🇷 - 🇯🇵 ODA Tokito
+LOCATION:Roland-Garros Stadium
+END:VEVENT
+BEGIN:VEVENT
 UID:20240903T100000Z-wheelchair-tennis-WOMENS-SINGLES-QUARTER-FINAL-NED-CHN
 DTSTAMP:20240903T100000Z
 DTSTART:20240903T100000Z
diff --git a/docs/medals.html b/docs/medals.html
index 7ea54ad3b..6a07516e9 100644
--- a/docs/medals.html
+++ b/docs/medals.html
@@ -3059,8 +3059,8 @@
     <span class="inline-block flex-auto">🇮🇩 Indonesia</span>
     <span class="inline-block text-center w-1/6 flex-none">1</span>
     <span class="inline-block text-center w-1/6 flex-none">6</span>
-    <span class="inline-block text-center w-1/6 flex-none">3</span>
-    <span class="inline-block text-center w-1/6 flex-none">10</span>
+    <span class="inline-block text-center w-1/6 flex-none">4</span>
+    <span class="inline-block text-center w-1/6 flex-none">11</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
@@ -3070,6 +3070,11 @@
       <td>Suryo NUGROHO</td>
       <td>Para Badminton - Men's Singles SU5 Gold Medal Match</td>
     </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Dheva ANRIMUSTHI</td>
+      <td>Para Badminton - Men's Singles SU5 Bronze Medal Match</td>
+    </tr>
     <tr>
       <td class="silver">&#9679;</td>
       <td>Leani Ratri OKTILA</td>
diff --git a/docs/today.html b/docs/today.html
index c243aa45d..fe6a11efb 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -29868,27 +29868,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240902T100000Z" data-end="20240902T160000Z" data-noc="BRA,JPN" >
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
-  <span class="time-start">__:__</span>
-  <div class="time-end text-xs">__:__</div>
- </div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   WHEELCHAIR TENNIS
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div>Men's Singles Third Round</div>
-    <div class="competitors">
-      Daniel RODRIGUES
-      🇧🇷
-      -
-      🇯🇵
-      ODA Tokito
-    </div>
- </div>
-</div>
 <div class="event py-4 " data-start="20240902T100000Z" data-end="20240902T160000Z" data-noc="FRA,JPN" >
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
   <span class="time-start">__:__</span>
@@ -29910,6 +29889,27 @@
     </div>
  </div>
 </div>
+<div class="event py-4 " data-start="20240902T100000Z" data-end="20240902T173000Z" data-noc="BRA,JPN" >
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
+  <span class="time-start">__:__</span>
+  <div class="time-end text-xs">__:__</div>
+ </div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   WHEELCHAIR TENNIS
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div>Men's Singles Third Round</div>
+    <div class="competitors">
+      Daniel RODRIGUES
+      🇧🇷
+      -
+      🇯🇵
+      ODA Tokito
+    </div>
+ </div>
+</div>
 <div class="event py-4 bg-amber-400" data-start="20240902T100500Z" data-end="20240902T113000Z" data-noc="BRA,ESP,FRA,GBR,GER,IRL,ITA,KGZ" >
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
   <span class="time-start">__:__</span>
@@ -31862,7 +31862,7 @@
     <div class="competitor UKR">🇺🇦 Zoia OVSII </div>
  </div>
 </div>
-<div class="event py-4 bg-orange-700" data-start="20240902T170500Z" data-end="20240902T172500Z" data-noc="" >
+<div class="event py-4 bg-orange-700" data-start="20240902T170500Z" data-end="20240902T172500Z" data-noc="IND" >
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
   <span class="time-start">__:__</span>
   <div class="time-end text-xs">__:__</div>
@@ -31873,6 +31873,7 @@
    PARA ARCHERY
    </div>
    <div>Mixed Team Compound Open Bronze Medal</div>
+    <div class="competitor IND">🇮🇳 India </div>
  </div>
 </div>
 <div class="event py-4 bg-amber-400" data-start="20240902T170800Z" data-end="20240902T171500Z" data-noc="ARG,BRA,UKR" >
@@ -32121,7 +32122,7 @@
     <div class="competitor CHN">🇨🇳 ZHOU Guohua </div>
  </div>
 </div>
-<div class="event py-4 bg-amber-400" data-start="20240902T172500Z" data-end="20240902T174500Z" data-noc="" >
+<div class="event py-4 bg-amber-400" data-start="20240902T172500Z" data-end="20240902T174500Z" data-noc="IRI" >
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
   <span class="time-start">__:__</span>
   <div class="time-end text-xs">__:__</div>
@@ -32132,6 +32133,7 @@
    PARA ARCHERY
    </div>
    <div>Mixed Team Compound Open Gold Medal</div>
+    <div class="competitor IRI">🇮🇷 IR Iran </div>
  </div>
 </div>
 <div class="event py-4 " data-start="20240902T173000Z" data-end="20240902T183000Z" data-noc="JPN,USA" >
@@ -42948,6 +42950,21 @@
     </div>
  </div>
 </div>
+<div class="event py-4 " data-start="20240904T160000Z" data-end="20240904T170000Z" data-noc="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">
+  <span class="time-start">__:__</span>
+  <div class="time-end text-xs">__:__</div>
+ </div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   GOALBALL
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div>Men's Semifinal</div>
+    <div class="competitor CHN">🇨🇳 China </div>
+ </div>
+</div>
 <div class="event py-4 bg-amber-400" data-start="20240904T160000Z" data-end="20240904T170000Z" data-noc="" >
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
   <span class="time-start">__:__</span>
@@ -42990,20 +43007,6 @@
    <div>Men's Singles - MS8 - Quarterfinal 2</div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240904T160000Z" data-end="20240904T171500Z" data-noc="" >
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
-  <span class="time-start">__:__</span>
-  <div class="time-end text-xs">__:__</div>
- </div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   GOALBALL
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div>Men's Semifinal</div>
- </div>
-</div>
 <div class="event py-4 " data-start="20240904T160000Z" data-end="20240904T173000Z" data-noc="" >
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
   <span class="time-start">__:__</span>