diff --git a/docs/en/general/BRA.ics b/docs/en/general/BRA.ics
index a28a787f7..7ed096014 100644
--- a/docs/en/general/BRA.ics
+++ b/docs/en/general/BRA.ics
@@ -2530,12 +2530,12 @@ SUMMARY: Thiago GOMES 🇧🇷 - 🇪🇬 Abdelrahman ABDALLA
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T111500Z-goalball-MENS-QUARTERFINAL
+UID:20240902T111500Z-goalball-MENS-QUARTERFINAL-BRA-EGY
 DTSTAMP:20240902T111500Z
 DTSTART:20240902T111500Z
 DTEND:20240902T121500Z
-DESCRIPTION:Goalball - Men's Quarterfinal\n🇧🇷 BRA
-SUMMARY:Men's Quarterfinal
+DESCRIPTION:Goalball - Men's Quarterfinal
+SUMMARY: BRA 🇧🇷 - 🇪🇬 EGY
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/CHN.ics b/docs/en/general/CHN.ics
index 069eec65b..a3b068e4a 100644
--- a/docs/en/general/CHN.ics
+++ b/docs/en/general/CHN.ics
@@ -3776,6 +3776,15 @@ SUMMARY:Mixed Team Compound Open Quarterfinal
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T154500Z-goalball-MENS-QUARTERFINAL-CHN-FRA
+DTSTAMP:20240902T154500Z
+DTSTART:20240902T154500Z
+DTEND:20240902T164500Z
+DESCRIPTION:Goalball - Men's Quarterfinal
+SUMMARY: CHN 🇨🇳 - 🇫🇷 FRA
+LOCATION:South Paris Arena 6
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T163000Z-blind-football-MENS-PRELIMINARY-ROUND-GROUP-A-TUR-CHN
 DTSTAMP:20240902T163000Z
 DTSTART:20240902T163000Z
diff --git a/docs/en/general/EGY.ics b/docs/en/general/EGY.ics
index 75d1c99b9..a9cb80495 100644
--- a/docs/en/general/EGY.ics
+++ b/docs/en/general/EGY.ics
@@ -412,6 +412,15 @@ SUMMARY: Thiago GOMES 🇧🇷 - 🇪🇬 Abdelrahman ABDALLA
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T111500Z-goalball-MENS-QUARTERFINAL-BRA-EGY
+DTSTAMP:20240902T111500Z
+DTSTART:20240902T111500Z
+DTEND:20240902T121500Z
+DESCRIPTION:Goalball - Men's Quarterfinal
+SUMMARY: BRA 🇧🇷 - 🇪🇬 EGY
+LOCATION:South Paris Arena 6
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T180000Z-para-table-tennis-WOMENS-SINGLES-WS1-2-ROUND-OF-16-EGY
 DTSTAMP:20240902T180000Z
 DTSTART:20240902T180000Z
diff --git a/docs/en/general/FRA.ics b/docs/en/general/FRA.ics
index 611f265be..6ca82a0c6 100644
--- a/docs/en/general/FRA.ics
+++ b/docs/en/general/FRA.ics
@@ -2516,12 +2516,12 @@ SUMMARY: Emeric MARTIN 🇫🇷 - 🇯🇵 SHICHINO Kazuki
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T154500Z-goalball-MENS-QUARTERFINAL
+UID:20240902T154500Z-goalball-MENS-QUARTERFINAL-CHN-FRA
 DTSTAMP:20240902T154500Z
 DTSTART:20240902T154500Z
 DTEND:20240902T164500Z
-DESCRIPTION:Goalball - Men's Quarterfinal\n🇫🇷 FRA
-SUMMARY:Men's Quarterfinal
+DESCRIPTION:Goalball - Men's Quarterfinal
+SUMMARY: CHN 🇨🇳 - 🇫🇷 FRA
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/IRI.ics b/docs/en/general/IRI.ics
index 6aee0452f..a7ab251ac 100644
--- a/docs/en/general/IRI.ics
+++ b/docs/en/general/IRI.ics
@@ -516,12 +516,12 @@ SUMMARY:Women's Shot Put - F54 Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T130000Z-goalball-MENS-QUARTERFINAL
+UID:20240902T130000Z-goalball-MENS-QUARTERFINAL-UKR-IRI
 DTSTAMP:20240902T130000Z
 DTSTART:20240902T130000Z
 DTEND:20240902T140000Z
-DESCRIPTION:Goalball - Men's Quarterfinal\n🇮🇷 IR Iran
-SUMMARY:Men's Quarterfinal
+DESCRIPTION:Goalball - Men's Quarterfinal
+SUMMARY: UKR 🇺🇦 - 🇮🇷 IRI
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/JPN.ics b/docs/en/general/JPN.ics
index a4f467edf..f0e371a8d 100644
--- a/docs/en/general/JPN.ics
+++ b/docs/en/general/JPN.ics
@@ -2197,6 +2197,15 @@ SUMMARY:Women's Discus Throw - F53 Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T173000Z-goalball-MENS-QUARTERFINAL-USA-JPN
+DTSTAMP:20240902T173000Z
+DTSTART:20240902T173000Z
+DTEND:20240902T183000Z
+DESCRIPTION:Goalball - Men's Quarterfinal
+SUMMARY: USA 🇺🇸 - 🇯🇵 JPN
+LOCATION:South Paris Arena 6
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T173000Z-wheelchair-rugby-OPEN-GOLD-MEDAL-GAME
 DTSTAMP:20240902T173000Z
 DTSTART:20240902T173000Z
diff --git a/docs/en/general/UKR.ics b/docs/en/general/UKR.ics
index 30562a878..122aedf01 100644
--- a/docs/en/general/UKR.ics
+++ b/docs/en/general/UKR.ics
@@ -1782,6 +1782,15 @@ SUMMARY:Women's PTS5
 LOCATION:Pont Alexandre III
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T130000Z-goalball-MENS-QUARTERFINAL-UKR-IRI
+DTSTAMP:20240902T130000Z
+DTSTART:20240902T130000Z
+DTEND:20240902T140000Z
+DESCRIPTION:Goalball - Men's Quarterfinal
+SUMMARY: UKR 🇺🇦 - 🇮🇷 IRI
+LOCATION:South Paris Arena 6
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-UKR-GER
 DTSTAMP:20240902T150000Z
 DTSTART:20240902T150000Z
diff --git a/docs/en/general/USA.ics b/docs/en/general/USA.ics
index 0760a3246..e201d51cf 100644
--- a/docs/en/general/USA.ics
+++ b/docs/en/general/USA.ics
@@ -2016,12 +2016,12 @@ SUMMARY:Women's Discus Throw - F53 Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T173000Z-goalball-MENS-QUARTERFINAL
+UID:20240902T173000Z-goalball-MENS-QUARTERFINAL-USA-JPN
 DTSTAMP:20240902T173000Z
 DTSTART:20240902T173000Z
 DTEND:20240902T183000Z
-DESCRIPTION:Goalball - Men's Quarterfinal\n🇺🇸 USA
-SUMMARY:Men's Quarterfinal
+DESCRIPTION:Goalball - Men's Quarterfinal
+SUMMARY: USA 🇺🇸 - 🇯🇵 JPN
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/general.ics b/docs/en/general/general.ics
index 1c0945fbc..a8079b18c 100644
--- a/docs/en/general/general.ics
+++ b/docs/en/general/general.ics
@@ -13873,12 +13873,12 @@ SUMMARY:P3 - Mixed 25m Pistol SH1 Qualification Rapid
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T111500Z-goalball-MENS-QUARTERFINAL
+UID:20240902T111500Z-goalball-MENS-QUARTERFINAL-BRA-EGY
 DTSTAMP:20240902T111500Z
 DTSTART:20240902T111500Z
 DTEND:20240902T121500Z
-DESCRIPTION:Goalball - Men's Quarterfinal\n🇧🇷 BRA
-SUMMARY:Men's Quarterfinal
+DESCRIPTION:Goalball - Men's Quarterfinal
+SUMMARY: BRA 🇧🇷 - 🇪🇬 EGY
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
@@ -13982,12 +13982,12 @@ SUMMARY: BRA 🇧🇷 - 🇸🇮 SLO
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T130000Z-goalball-MENS-QUARTERFINAL
+UID:20240902T130000Z-goalball-MENS-QUARTERFINAL-UKR-IRI
 DTSTAMP:20240902T130000Z
 DTSTART:20240902T130000Z
 DTEND:20240902T140000Z
-DESCRIPTION:Goalball - Men's Quarterfinal\n🇮🇷 IR Iran
-SUMMARY:Men's Quarterfinal
+DESCRIPTION:Goalball - Men's Quarterfinal
+SUMMARY: UKR 🇺🇦 - 🇮🇷 IRI
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
@@ -14284,12 +14284,12 @@ SUMMARY:Women's Singles - WS10 - Quarterfinal 2
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T154500Z-goalball-MENS-QUARTERFINAL
+UID:20240902T154500Z-goalball-MENS-QUARTERFINAL-CHN-FRA
 DTSTAMP:20240902T154500Z
 DTSTART:20240902T154500Z
 DTEND:20240902T164500Z
-DESCRIPTION:Goalball - Men's Quarterfinal\n🇫🇷 FRA
-SUMMARY:Men's Quarterfinal
+DESCRIPTION:Goalball - Men's Quarterfinal
+SUMMARY: CHN 🇨🇳 - 🇫🇷 FRA
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
@@ -14651,12 +14651,12 @@ SUMMARY:Mixed Team Compound Open Gold Medal
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T173000Z-goalball-MENS-QUARTERFINAL
+UID:20240902T173000Z-goalball-MENS-QUARTERFINAL-USA-JPN
 DTSTAMP:20240902T173000Z
 DTSTART:20240902T173000Z
 DTEND:20240902T183000Z
-DESCRIPTION:Goalball - Men's Quarterfinal\n🇺🇸 USA
-SUMMARY:Men's Quarterfinal
+DESCRIPTION:Goalball - Men's Quarterfinal
+SUMMARY: USA 🇺🇸 - 🇯🇵 JPN
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/goalball/BRA.ics b/docs/en/goalball/BRA.ics
index d444a0475..42408476c 100644
--- a/docs/en/goalball/BRA.ics
+++ b/docs/en/goalball/BRA.ics
@@ -58,12 +58,12 @@ SUMMARY: BRA 🇧🇷 - 🇮🇷 IRI
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T111500Z-goalball-MENS-QUARTERFINAL
+UID:20240902T111500Z-goalball-MENS-QUARTERFINAL-BRA-EGY
 DTSTAMP:20240902T111500Z
 DTSTART:20240902T111500Z
 DTEND:20240902T121500Z
-DESCRIPTION:Goalball - Men's Quarterfinal\n🇧🇷 BRA
-SUMMARY:Men's Quarterfinal
+DESCRIPTION:Goalball - Men's Quarterfinal
+SUMMARY: BRA 🇧🇷 - 🇪🇬 EGY
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/goalball/CHN.ics b/docs/en/goalball/CHN.ics
index 28a4bc5fa..ac5bb140d 100644
--- a/docs/en/goalball/CHN.ics
+++ b/docs/en/goalball/CHN.ics
@@ -58,6 +58,15 @@ SUMMARY: CHN 🇨🇳 - 🇺🇦 UKR
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T154500Z-goalball-MENS-QUARTERFINAL-CHN-FRA
+DTSTAMP:20240902T154500Z
+DTSTART:20240902T154500Z
+DTEND:20240902T164500Z
+DESCRIPTION:Goalball - Men's Quarterfinal
+SUMMARY: CHN 🇨🇳 - 🇫🇷 FRA
+LOCATION:South Paris Arena 6
+END:VEVENT
+BEGIN:VEVENT
 UID:20240903T113000Z-goalball-WOMENS-QUARTERFINAL
 DTSTAMP:20240903T113000Z
 DTSTART:20240903T113000Z
diff --git a/docs/en/goalball/EGY.ics b/docs/en/goalball/EGY.ics
index f35847160..244d6c6a2 100644
--- a/docs/en/goalball/EGY.ics
+++ b/docs/en/goalball/EGY.ics
@@ -30,4 +30,13 @@ DESCRIPTION:Goalball - Men's Preliminary Round - Pool B
 SUMMARY: EGY 🇪🇬 - 🇯🇵 JPN
 LOCATION:South Paris Arena 6
 END:VEVENT
+BEGIN:VEVENT
+UID:20240902T111500Z-goalball-MENS-QUARTERFINAL-BRA-EGY
+DTSTAMP:20240902T111500Z
+DTSTART:20240902T111500Z
+DTEND:20240902T121500Z
+DESCRIPTION:Goalball - Men's Quarterfinal
+SUMMARY: BRA 🇧🇷 - 🇪🇬 EGY
+LOCATION:South Paris Arena 6
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/goalball/FRA.ics b/docs/en/goalball/FRA.ics
index d27541ce1..7f3a30a3a 100644
--- a/docs/en/goalball/FRA.ics
+++ b/docs/en/goalball/FRA.ics
@@ -58,12 +58,12 @@ SUMMARY: FRA 🇫🇷 - 🇯🇵 JPN
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T154500Z-goalball-MENS-QUARTERFINAL
+UID:20240902T154500Z-goalball-MENS-QUARTERFINAL-CHN-FRA
 DTSTAMP:20240902T154500Z
 DTSTART:20240902T154500Z
 DTEND:20240902T164500Z
-DESCRIPTION:Goalball - Men's Quarterfinal\n🇫🇷 FRA
-SUMMARY:Men's Quarterfinal
+DESCRIPTION:Goalball - Men's Quarterfinal
+SUMMARY: CHN 🇨🇳 - 🇫🇷 FRA
 LOCATION:South Paris Arena 6
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/goalball/IRI.ics b/docs/en/goalball/IRI.ics
index 712d3010c..d62a4d130 100644
--- a/docs/en/goalball/IRI.ics
+++ b/docs/en/goalball/IRI.ics
@@ -31,12 +31,12 @@ SUMMARY: IR Iran 🇮🇷 - 🇺🇸 United States
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T130000Z-goalball-MENS-QUARTERFINAL
+UID:20240902T130000Z-goalball-MENS-QUARTERFINAL-UKR-IRI
 DTSTAMP:20240902T130000Z
 DTSTART:20240902T130000Z
 DTEND:20240902T140000Z
-DESCRIPTION:Goalball - Men's Quarterfinal\n🇮🇷 IR Iran
-SUMMARY:Men's Quarterfinal
+DESCRIPTION:Goalball - Men's Quarterfinal
+SUMMARY: UKR 🇺🇦 - 🇮🇷 IRI
 LOCATION:South Paris Arena 6
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/goalball/JPN.ics b/docs/en/goalball/JPN.ics
index ba8b77565..4e3aea075 100644
--- a/docs/en/goalball/JPN.ics
+++ b/docs/en/goalball/JPN.ics
@@ -57,4 +57,13 @@ DESCRIPTION:Goalball - Women's Preliminary Round - Pool D
 SUMMARY: FRA 🇫🇷 - 🇯🇵 JPN
 LOCATION:South Paris Arena 6
 END:VEVENT
+BEGIN:VEVENT
+UID:20240902T173000Z-goalball-MENS-QUARTERFINAL-USA-JPN
+DTSTAMP:20240902T173000Z
+DTSTART:20240902T173000Z
+DTEND:20240902T183000Z
+DESCRIPTION:Goalball - Men's Quarterfinal
+SUMMARY: USA 🇺🇸 - 🇯🇵 JPN
+LOCATION:South Paris Arena 6
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/goalball/UKR.ics b/docs/en/goalball/UKR.ics
index 861bb3688..2be3c96cd 100644
--- a/docs/en/goalball/UKR.ics
+++ b/docs/en/goalball/UKR.ics
@@ -30,4 +30,13 @@ DESCRIPTION:Goalball - Men's Preliminary Round - Pool B
 SUMMARY: CHN 🇨🇳 - 🇺🇦 UKR
 LOCATION:South Paris Arena 6
 END:VEVENT
+BEGIN:VEVENT
+UID:20240902T130000Z-goalball-MENS-QUARTERFINAL-UKR-IRI
+DTSTAMP:20240902T130000Z
+DTSTART:20240902T130000Z
+DTEND:20240902T140000Z
+DESCRIPTION:Goalball - Men's Quarterfinal
+SUMMARY: UKR 🇺🇦 - 🇮🇷 IRI
+LOCATION:South Paris Arena 6
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/goalball/USA.ics b/docs/en/goalball/USA.ics
index 7bd65d7d2..bb3d89e24 100644
--- a/docs/en/goalball/USA.ics
+++ b/docs/en/goalball/USA.ics
@@ -31,12 +31,12 @@ SUMMARY: IR Iran 🇮🇷 - 🇺🇸 United States
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T173000Z-goalball-MENS-QUARTERFINAL
+UID:20240902T173000Z-goalball-MENS-QUARTERFINAL-USA-JPN
 DTSTAMP:20240902T173000Z
 DTSTART:20240902T173000Z
 DTEND:20240902T183000Z
-DESCRIPTION:Goalball - Men's Quarterfinal\n🇺🇸 USA
-SUMMARY:Men's Quarterfinal
+DESCRIPTION:Goalball - Men's Quarterfinal
+SUMMARY: USA 🇺🇸 - 🇯🇵 JPN
 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 e5b71cdf8..5591f0c98 100644
--- a/docs/en/goalball/general.ics
+++ b/docs/en/goalball/general.ics
@@ -220,39 +220,39 @@ SUMMARY: FRA 🇫🇷 - 🇯🇵 JPN
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T111500Z-goalball-MENS-QUARTERFINAL
+UID:20240902T111500Z-goalball-MENS-QUARTERFINAL-BRA-EGY
 DTSTAMP:20240902T111500Z
 DTSTART:20240902T111500Z
 DTEND:20240902T121500Z
-DESCRIPTION:Goalball - Men's Quarterfinal\n🇧🇷 BRA
-SUMMARY:Men's Quarterfinal
+DESCRIPTION:Goalball - Men's Quarterfinal
+SUMMARY: BRA 🇧🇷 - 🇪🇬 EGY
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T130000Z-goalball-MENS-QUARTERFINAL
+UID:20240902T130000Z-goalball-MENS-QUARTERFINAL-UKR-IRI
 DTSTAMP:20240902T130000Z
 DTSTART:20240902T130000Z
 DTEND:20240902T140000Z
-DESCRIPTION:Goalball - Men's Quarterfinal\n🇮🇷 IR Iran
-SUMMARY:Men's Quarterfinal
+DESCRIPTION:Goalball - Men's Quarterfinal
+SUMMARY: UKR 🇺🇦 - 🇮🇷 IRI
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T154500Z-goalball-MENS-QUARTERFINAL
+UID:20240902T154500Z-goalball-MENS-QUARTERFINAL-CHN-FRA
 DTSTAMP:20240902T154500Z
 DTSTART:20240902T154500Z
 DTEND:20240902T164500Z
-DESCRIPTION:Goalball - Men's Quarterfinal\n🇫🇷 FRA
-SUMMARY:Men's Quarterfinal
+DESCRIPTION:Goalball - Men's Quarterfinal
+SUMMARY: CHN 🇨🇳 - 🇫🇷 FRA
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T173000Z-goalball-MENS-QUARTERFINAL
+UID:20240902T173000Z-goalball-MENS-QUARTERFINAL-USA-JPN
 DTSTAMP:20240902T173000Z
 DTSTART:20240902T173000Z
 DTEND:20240902T183000Z
-DESCRIPTION:Goalball - Men's Quarterfinal\n🇺🇸 USA
-SUMMARY:Men's Quarterfinal
+DESCRIPTION:Goalball - Men's Quarterfinal
+SUMMARY: USA 🇺🇸 - 🇯🇵 JPN
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/today.html b/docs/today.html
index 52ab37762..fc4a26dec 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -30282,7 +30282,7 @@
    <div>P3 - Mixed 25m Pistol SH1 Qualification Rapid</div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240902T111500Z" data-end="20240902T121500Z" data-noc="BRA" >
+<div class="event py-4 " data-start="20240902T111500Z" data-end="20240902T121500Z" data-noc="BRA,EGY" >
  <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>
@@ -30294,7 +30294,13 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div>Men's Quarterfinal</div>
-    <div class="competitor BRA">🇧🇷 Brazil </div>
+    <div class="competitors">
+      Brazil
+      🇧🇷
+      -
+      🇪🇬
+      Egypt
+    </div>
  </div>
 </div>
 <div class="event py-4 bg-amber-400" data-start="20240902T112500Z" data-end="20240902T122500Z" data-noc="CHN,HKG" >
@@ -30515,7 +30521,7 @@
     </div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240902T130000Z" data-end="20240902T140000Z" data-noc="IRI" >
+<div class="event py-4 " data-start="20240902T130000Z" data-end="20240902T140000Z" data-noc="IRI,UKR" >
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
   <span class="time-start">__:__</span>
   <div class="time-end text-xs">__:__</div>
@@ -30527,7 +30533,13 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div>Men's Quarterfinal</div>
-    <div class="competitor IRI">🇮🇷 IR Iran </div>
+    <div class="competitors">
+      Ukraine
+      🇺🇦
+      -
+      🇮🇷
+      IR Iran
+    </div>
  </div>
 </div>
 <div class="event py-4 " data-start="20240902T133000Z" data-end="20240902T135000Z" data-noc="INA,IRQ" >
@@ -31074,7 +31086,7 @@
     <div class="competitor BRA">🇧🇷 Bruna ALEXANDRE </div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240902T154500Z" data-end="20240902T164500Z" data-noc="FRA" >
+<div class="event py-4 " data-start="20240902T154500Z" data-end="20240902T164500Z" data-noc="CHN,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">
   <span class="time-start">__:__</span>
   <div class="time-end text-xs">__:__</div>
@@ -31086,7 +31098,13 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div>Men's Quarterfinal</div>
-    <div class="competitor FRA">🇫🇷 France </div>
+    <div class="competitors">
+      China
+      🇨🇳
+      -
+      🇫🇷
+      France
+    </div>
  </div>
 </div>
 <div class="event py-4 " data-start="20240902T155000Z" data-end="20240902T161000Z" data-noc="GBR" >
@@ -31737,7 +31755,7 @@
    <div>Mixed Team Compound Open Gold Medal</div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240902T173000Z" data-end="20240902T183000Z" data-noc="USA" >
+<div class="event py-4 " data-start="20240902T173000Z" data-end="20240902T183000Z" data-noc="JPN,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">
   <span class="time-start">__:__</span>
   <div class="time-end text-xs">__:__</div>
@@ -31749,7 +31767,13 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div>Men's Quarterfinal</div>
-    <div class="competitor USA">🇺🇸 United States </div>
+    <div class="competitors">
+      United States
+      🇺🇸
+      -
+      🇯🇵
+      Japan
+    </div>
  </div>
 </div>
 <div class="event py-4 bg-amber-400" data-start="20240902T173000Z" data-end="20240902T191500Z" data-noc="JPN" >