diff --git a/docs/medals.html b/docs/medals.html
index 124463daa..1078a1090 100644
--- a/docs/medals.html
+++ b/docs/medals.html
@@ -67,9 +67,9 @@
   <div class="flex collapse-title text-xl font-medium">
     <span class="inline-block flex-auto">🇨🇳 China</span>
     <span class="inline-block text-center w-1/6 flex-none">79</span>
-    <span class="inline-block text-center w-1/6 flex-none">61</span>
+    <span class="inline-block text-center w-1/6 flex-none">62</span>
     <span class="inline-block text-center w-1/6 flex-none">41</span>
-    <span class="inline-block text-center w-1/6 flex-none">181</span>
+    <span class="inline-block text-center w-1/6 flex-none">182</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
@@ -79,6 +79,11 @@
       <td>GU Haiyan</td>
       <td>Wheelchair Fencing - Women's Épée Category A Bronze Medal Bout</td>
     </tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>GU Xiaofei</td>
+      <td>Para Powerlifting - Men's up to 80kg Final</td>
+    </tr>
     <tr>
       <td class="silver">&#9679;</td>
       <td>LIU Jing</td>
@@ -994,14 +999,19 @@
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
     <span class="inline-block flex-auto">🇬🇧 Great Britain</span>
-    <span class="inline-block text-center w-1/6 flex-none">41</span>
+    <span class="inline-block text-center w-1/6 flex-none">42</span>
     <span class="inline-block text-center w-1/6 flex-none">31</span>
     <span class="inline-block text-center w-1/6 flex-none">23</span>
-    <span class="inline-block text-center w-1/6 flex-none">95</span>
+    <span class="inline-block text-center w-1/6 flex-none">96</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
     <tr><td colspan="3" class="font-medium">2024-09-06</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Dimitri COUTYA</td>
+      <td>Wheelchair Fencing - Men's Épée Category B Gold Medal Bout</td>
+    </tr>
     <tr>
       <td class="gold">&#9679;</td>
       <td>Poppy MASKILL</td>
@@ -3853,13 +3863,18 @@
   <div class="flex collapse-title text-xl font-medium">
     <span class="inline-block flex-auto">🇯🇵 Japan</span>
     <span class="inline-block text-center w-1/6 flex-none">11</span>
-    <span class="inline-block text-center w-1/6 flex-none">9</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">14</span>
-    <span class="inline-block text-center w-1/6 flex-none">34</span>
+    <span class="inline-block text-center w-1/6 flex-none">35</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
     <tr><td colspan="3" class="font-medium">2024-09-06</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>SUZUKI Takayuki</td>
+      <td>Para Swimming - Men's 50m Freestyle - S4 Final</td>
+    </tr>
     <tr>
       <td class="bronze">&#9679;</td>
       <td>OGAWA Kazusa</td>
@@ -4592,6 +4607,139 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇨🇦 Canada</span>
+    <span class="inline-block text-center w-1/6 flex-none">7</span>
+    <span class="inline-block text-center w-1/6 flex-none">7</span>
+    <span class="inline-block text-center w-1/6 flex-none">8</span>
+    <span class="inline-block text-center w-1/6 flex-none">22</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-09-06</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Sebastian MASSABIE</td>
+      <td>Para Swimming - Men's 50m Freestyle - S4 Final</td>
+    </tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Jesse ZESSEU</td>
+      <td>Para Athletics - Men's Discus Throw - F37 Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-09-05</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Brent LAKATOS</td>
+      <td>Para Athletics - Men's 800m - T53 Final</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Aurelie RIVARD</td>
+      <td>Para Swimming - Women's 400m Freestyle - S10 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Tess ROUTLIFFE</td>
+      <td>Para Swimming - Women's 100m Breaststroke - SB7 Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-09-04</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Reid MAXWELL</td>
+      <td>Para Swimming - Men's 400m Freestyle - S8 Final</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Nicholas BENNETT</td>
+      <td>Para Swimming - Men's 200m Individual Medley - SM14 Final</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Greg STEWART</td>
+      <td>Para Athletics - Men's Shot Put - F46 Final</td>
+    </tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Nathan CLEMENT</td>
+      <td>Para Cycling Road - Men's T1-2 Individual Time Trial</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-09-03</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Katie COSGRIFFE</td>
+      <td>Para Swimming - Women's 100m Butterfly - S10 Final</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Cody FOURNIE</td>
+      <td>Para Athletics - Men's 200m - T51 Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-09-02</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Nicholas BENNETT</td>
+      <td>Para Swimming - Men's 100m Breaststroke - SB14 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Austin SMEENK</td>
+      <td>Para Athletics - Men's 100m - T34 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Leanne TAYLOR</td>
+      <td>Para Triathlon - Women's PTWC</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-09-01</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Brent LAKATOS</td>
+      <td>Para Athletics - Men's 400m - T53 Final</td>
+    </tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Aurelie RIVARD</td>
+      <td>Para Swimming - Women's 100m Freestyle - S10 Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-08-31</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Tess ROUTLIFFE</td>
+      <td>Para Swimming - Women's 200m Individual Medley - SM7 Final</td>
+    </tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Nicholas BENNETT</td>
+      <td>Para Swimming - Men's 200m Freestyle - S14 Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-08-30</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Alexandre HAYWARD</td>
+      <td>Para Cycling Track - Men's C3 3000m Individual Pursuit Final - Bronze</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Keely SHAW</td>
+      <td>Para Cycling Track - Women's C4 3000m Individual Pursuit Final - Bronze</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-08-29</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Aurelie RIVARD</td>
+      <td>Para Swimming - Women's 50m Freestyle - S10 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Kate O'BRIEN</td>
+      <td>Para Cycling Track - Women's C4-5 500m Time Trial - Final</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -4744,134 +4892,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇨🇦 Canada</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">7</span>
-    <span class="inline-block text-center w-1/6 flex-none">8</span>
-    <span class="inline-block text-center w-1/6 flex-none">21</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-09-06</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Jesse ZESSEU</td>
-      <td>Para Athletics - Men's Discus Throw - F37 Final</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-09-05</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Brent LAKATOS</td>
-      <td>Para Athletics - Men's 800m - T53 Final</td>
-    </tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Aurelie RIVARD</td>
-      <td>Para Swimming - Women's 400m Freestyle - S10 Final</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Tess ROUTLIFFE</td>
-      <td>Para Swimming - Women's 100m Breaststroke - SB7 Final</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-09-04</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Reid MAXWELL</td>
-      <td>Para Swimming - Men's 400m Freestyle - S8 Final</td>
-    </tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Nicholas BENNETT</td>
-      <td>Para Swimming - Men's 200m Individual Medley - SM14 Final</td>
-    </tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Greg STEWART</td>
-      <td>Para Athletics - Men's Shot Put - F46 Final</td>
-    </tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Nathan CLEMENT</td>
-      <td>Para Cycling Road - Men's T1-2 Individual Time Trial</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-09-03</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Katie COSGRIFFE</td>
-      <td>Para Swimming - Women's 100m Butterfly - S10 Final</td>
-    </tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Cody FOURNIE</td>
-      <td>Para Athletics - Men's 200m - T51 Final</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-09-02</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Nicholas BENNETT</td>
-      <td>Para Swimming - Men's 100m Breaststroke - SB14 Final</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Austin SMEENK</td>
-      <td>Para Athletics - Men's 100m - T34 Final</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Leanne TAYLOR</td>
-      <td>Para Triathlon - Women's PTWC</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-09-01</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Brent LAKATOS</td>
-      <td>Para Athletics - Men's 400m - T53 Final</td>
-    </tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Aurelie RIVARD</td>
-      <td>Para Swimming - Women's 100m Freestyle - S10 Final</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-08-31</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Tess ROUTLIFFE</td>
-      <td>Para Swimming - Women's 200m Individual Medley - SM7 Final</td>
-    </tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Nicholas BENNETT</td>
-      <td>Para Swimming - Men's 200m Freestyle - S14 Final</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-08-30</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Alexandre HAYWARD</td>
-      <td>Para Cycling Track - Men's C3 3000m Individual Pursuit Final - Bronze</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Keely SHAW</td>
-      <td>Para Cycling Track - Women's C4 3000m Individual Pursuit Final - Bronze</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-08-29</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Aurelie RIVARD</td>
-      <td>Para Swimming - Women's 50m Freestyle - S10 Final</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Kate O'BRIEN</td>
-      <td>Para Cycling Track - Women's C4-5 500m Time Trial - Final</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -5101,6 +5121,153 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇹🇭 Thailand</span>
+    <span class="inline-block text-center w-1/6 flex-none">5</span>
+    <span class="inline-block text-center w-1/6 flex-none">9</span>
+    <span class="inline-block text-center w-1/6 flex-none">11</span>
+    <span class="inline-block text-center w-1/6 flex-none">25</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-09-06</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Visit KINGMANAW</td>
+      <td>Wheelchair Fencing - Men's Épée Category B Gold Medal Bout</td>
+    </tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Rungroj THAINIYOM</td>
+      <td>Para Table Tennis - Men's Singles - MS6 - Gold Medal Match</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Phisit WANGPHONPHATHANASIRI</td>
+      <td>Para Table Tennis - Men's Singles - MS8 - Semifinal 1</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Chalermpong PUNPOO</td>
+      <td>Para Table Tennis - Men's Singles - MS7 - Semifinal 2</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-09-05</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Pongsakorn PAEYO</td>
+      <td>Para Athletics - Men's 800m - T53 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Kamolpan KRARATPET</td>
+      <td>Para Powerlifting - Women's up to 55kg Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Thailand</td>
+      <td>Boccia - Mixed Pairs - BC4 Bronze Medal Match</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Yuttajak GLINBANCHEUN</td>
+      <td>Para Table Tennis - Men's Singles - MS3 - Semifinal 2</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-09-04</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Saysunee JANA</td>
+      <td>Wheelchair Fencing - Women's Foil Category B Gold Medal Bout</td>
+    </tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Athiwat PAENG-NUEA</td>
+      <td>Para Athletics - Men's 100m - T54 Final</td>
+    </tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Pongsakorn PAEYO</td>
+      <td>Para Athletics - Men's 100m - T53 Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-09-03</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Saysunee JANA</td>
+      <td>Wheelchair Fencing - Women's Sabre Category B Gold Medal Bout</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-09-02</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Sujirat POOKKHAM</td>
+      <td>Para Badminton - Women's Singles WH1 Gold Medal Match</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Mongkhon BUNSUN</td>
+      <td>Para Badminton - Men's Singles SL3 Bronze Medal Match</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Chaiwat RATTANA</td>
+      <td>Para Athletics - Men's 100m - T34 Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-09-01</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Worawut SAENGAMPA</td>
+      <td>Boccia - Men's Individual - BC2 Gold Medal Match</td>
+    </tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Athiwat PAENG-NUEA</td>
+      <td>Para Athletics - Men's 400m - T54 Final</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Pongsakorn PAEYO</td>
+      <td>Para Athletics - Men's 400m - T53 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>POOKKHAM/WETWITHAN</td>
+      <td>Para Badminton - Women's Doubles WH1-WH2 Bronze Medal Match</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Watcharaphon VONGSA</td>
+      <td>Boccia - Men's Individual - BC2 Bronze Medal Match</td>
+    </tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>THAINIYOM/WANGPHONPH</td>
+      <td>Para Table Tennis - Men's Doubles - MD14 - Gold Medal Match</td>
+    </tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>GLINBANCHE/JAION</td>
+      <td>Para Table Tennis - Mixed Doubles - XD7 - Gold Medal Match</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-08-30</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>CHAIWUT/GLINBANCHE</td>
+      <td>Para Table Tennis - Men's Doubles - MD8 - Semifinal 1</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>ASAYUT/BOOTWANSIR</td>
+      <td>Para Table Tennis - Women's Doubles - WD5 - Semifinal 2</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-08-29</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Khwansuda PHUANGKITCHA</td>
+      <td>Para Taekwondo - Women K44 -47kg Bronze Medal Contests</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -5252,148 +5419,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇹🇭 Thailand</span>
-    <span class="inline-block text-center w-1/6 flex-none">5</span>
-    <span class="inline-block text-center w-1/6 flex-none">8</span>
-    <span class="inline-block text-center w-1/6 flex-none">11</span>
-    <span class="inline-block text-center w-1/6 flex-none">24</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-09-06</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Rungroj THAINIYOM</td>
-      <td>Para Table Tennis - Men's Singles - MS6 - Gold Medal Match</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Phisit WANGPHONPHATHANASIRI</td>
-      <td>Para Table Tennis - Men's Singles - MS8 - Semifinal 1</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Chalermpong PUNPOO</td>
-      <td>Para Table Tennis - Men's Singles - MS7 - Semifinal 2</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-09-05</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Pongsakorn PAEYO</td>
-      <td>Para Athletics - Men's 800m - T53 Final</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Kamolpan KRARATPET</td>
-      <td>Para Powerlifting - Women's up to 55kg Final</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Thailand</td>
-      <td>Boccia - Mixed Pairs - BC4 Bronze Medal Match</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Yuttajak GLINBANCHEUN</td>
-      <td>Para Table Tennis - Men's Singles - MS3 - Semifinal 2</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-09-04</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Saysunee JANA</td>
-      <td>Wheelchair Fencing - Women's Foil Category B Gold Medal Bout</td>
-    </tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Athiwat PAENG-NUEA</td>
-      <td>Para Athletics - Men's 100m - T54 Final</td>
-    </tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Pongsakorn PAEYO</td>
-      <td>Para Athletics - Men's 100m - T53 Final</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-09-03</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Saysunee JANA</td>
-      <td>Wheelchair Fencing - Women's Sabre Category B Gold Medal Bout</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-09-02</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Sujirat POOKKHAM</td>
-      <td>Para Badminton - Women's Singles WH1 Gold Medal Match</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Mongkhon BUNSUN</td>
-      <td>Para Badminton - Men's Singles SL3 Bronze Medal Match</td>
-    </tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Chaiwat RATTANA</td>
-      <td>Para Athletics - Men's 100m - T34 Final</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-09-01</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Worawut SAENGAMPA</td>
-      <td>Boccia - Men's Individual - BC2 Gold Medal Match</td>
-    </tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Athiwat PAENG-NUEA</td>
-      <td>Para Athletics - Men's 400m - T54 Final</td>
-    </tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Pongsakorn PAEYO</td>
-      <td>Para Athletics - Men's 400m - T53 Final</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>POOKKHAM/WETWITHAN</td>
-      <td>Para Badminton - Women's Doubles WH1-WH2 Bronze Medal Match</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Watcharaphon VONGSA</td>
-      <td>Boccia - Men's Individual - BC2 Bronze Medal Match</td>
-    </tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>THAINIYOM/WANGPHONPH</td>
-      <td>Para Table Tennis - Men's Doubles - MD14 - Gold Medal Match</td>
-    </tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>GLINBANCHE/JAION</td>
-      <td>Para Table Tennis - Mixed Doubles - XD7 - Gold Medal Match</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-08-30</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>CHAIWUT/GLINBANCHE</td>
-      <td>Para Table Tennis - Men's Doubles - MD8 - Semifinal 1</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>ASAYUT/BOOTWANSIR</td>
-      <td>Para Table Tennis - Women's Doubles - WD5 - Semifinal 2</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-08-29</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Khwansuda PHUANGKITCHA</td>
-      <td>Para Taekwondo - Women K44 -47kg Bronze Medal Contests</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -5860,153 +5885,20 @@
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇭🇺 Hungary</span>
+    <span class="inline-block flex-auto">🇮🇷 Iran</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">4</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">11</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">6</span>
+    <span class="inline-block text-center w-1/6 flex-none">20</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
     <tr><td colspan="3" class="font-medium">2024-09-06</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Zsofia KONKOLY</td>
-      <td>Para Swimming - Women's 100m Butterfly - S9 Final</td>
-    </tr>
     <tr>
       <td class="gold">&#9679;</td>
-      <td>Bianka PAP</td>
-      <td>Para Swimming - Women's 100m Backstroke - S10 Final</td>
+      <td>Roohallah ROSTAMI</td>
+      <td>Para Powerlifting - Men's up to 80kg Final</td>
     </tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Petra LUTERAN</td>
-      <td>Para Athletics - Women's Long Jump - T47 Final</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-09-05</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Hungary</td>
-      <td>Wheelchair Fencing - Women's Foil Team Gold Medal Match</td>
-    </tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Zsofia KONKOLY</td>
-      <td>Para Swimming - Women's 200m Individual Medley - SM9 Final</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Bianka PAP</td>
-      <td>Para Swimming - Women's 400m Freestyle - S10 Final</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Peter PALOS</td>
-      <td>Para Table Tennis - Men's Singles - MS11 - Semifinal 2</td>
-    </tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Luca EKLER</td>
-      <td>Para Athletics - Women's Long Jump - T38 Final</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-09-04</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Endre MAJOR</td>
-      <td>Para Table Tennis - Men's Singles - MS1 - Semifinal 2</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-09-02</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Fanni ILLES</td>
-      <td>Para Swimming - Women's 100m Breaststroke - SB4 Final</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-08-29</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Zsofia KONKOLY</td>
-      <td>Para Swimming - Women's 400m Freestyle - S9 Final</td>
-    </tr>
-  </table>
-  </div>
-</div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇮🇱 Israel</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">2</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">9</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-09-05</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Israel</td>
-      <td>Goalball - Women's Gold Medal Game</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Guy SASSON</td>
-      <td>Wheelchair Tennis - Quad Singles Bronze Medal Match</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-09-03</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Ami Omer DADAON</td>
-      <td>Para Swimming - Men's 200m Freestyle - S4 Final</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-09-01</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Ami Omer DADAON</td>
-      <td>Para Swimming - Men's 150m Individual Medley - SM4 Final</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Israel</td>
-      <td>Para Rowing - PR2 Mixed Double Sculls Final A</td>
-    </tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Moran SAMUEL</td>
-      <td>Para Rowing - PR1 Women’s Single Sculls Final A</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-08-31</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Mark MALYAR</td>
-      <td>Para Swimming - Men's 100m Backstroke - S8 Final</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-08-30</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Ami Omer DADAON</td>
-      <td>Para Swimming - Men's 100m Freestyle - S4 Final</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-08-29</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Asaf YASUR</td>
-      <td>Para Taekwondo - Men K44 -58kg Gold Medal Contest</td>
-    </tr>
-  </table>
-  </div>
-</div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇮🇷 Iran</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">6</span>
-    <span class="inline-block text-center w-1/6 flex-none">19</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
     <tr><td colspan="3" class="font-medium">2024-09-05</td></tr>
     <tr>
       <td class="silver">&#9679;</td>
@@ -6113,6 +6005,151 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇭🇺 Hungary</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">4</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">11</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-09-06</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Zsofia KONKOLY</td>
+      <td>Para Swimming - Women's 100m Butterfly - S9 Final</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Bianka PAP</td>
+      <td>Para Swimming - Women's 100m Backstroke - S10 Final</td>
+    </tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Petra LUTERAN</td>
+      <td>Para Athletics - Women's Long Jump - T47 Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-09-05</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Hungary</td>
+      <td>Wheelchair Fencing - Women's Foil Team Gold Medal Match</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Zsofia KONKOLY</td>
+      <td>Para Swimming - Women's 200m Individual Medley - SM9 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Bianka PAP</td>
+      <td>Para Swimming - Women's 400m Freestyle - S10 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Peter PALOS</td>
+      <td>Para Table Tennis - Men's Singles - MS11 - Semifinal 2</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Luca EKLER</td>
+      <td>Para Athletics - Women's Long Jump - T38 Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-09-04</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Endre MAJOR</td>
+      <td>Para Table Tennis - Men's Singles - MS1 - Semifinal 2</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-09-02</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Fanni ILLES</td>
+      <td>Para Swimming - Women's 100m Breaststroke - SB4 Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-08-29</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Zsofia KONKOLY</td>
+      <td>Para Swimming - Women's 400m Freestyle - S9 Final</td>
+    </tr>
+  </table>
+  </div>
+</div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇮🇱 Israel</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">2</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">10</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-09-06</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Ami Omer DADAON</td>
+      <td>Para Swimming - Men's 50m Freestyle - S4 Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-09-05</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Israel</td>
+      <td>Goalball - Women's Gold Medal Game</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Guy SASSON</td>
+      <td>Wheelchair Tennis - Quad Singles Bronze Medal Match</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-09-03</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Ami Omer DADAON</td>
+      <td>Para Swimming - Men's 200m Freestyle - S4 Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-09-01</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Ami Omer DADAON</td>
+      <td>Para Swimming - Men's 150m Individual Medley - SM4 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Israel</td>
+      <td>Para Rowing - PR2 Mixed Double Sculls Final A</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Moran SAMUEL</td>
+      <td>Para Rowing - PR1 Women’s Single Sculls Final A</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-08-31</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Mark MALYAR</td>
+      <td>Para Swimming - Men's 100m Backstroke - S8 Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-08-30</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Ami Omer DADAON</td>
+      <td>Para Swimming - Men's 100m Freestyle - S4 Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-08-29</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Asaf YASUR</td>
+      <td>Para Taekwondo - Men K44 -58kg Gold Medal Contest</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -7981,6 +8018,32 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇮🇶 Iraq</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-09-06</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Rasool MOHSIN</td>
+      <td>Para Powerlifting - Men's up to 80kg Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-09-01</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Garrah TNAIASH</td>
+      <td>Para Athletics - Men's Shot Put - F40 Final</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -8001,26 +8064,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇮🇶 Iraq</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</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">1</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-09-01</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Garrah TNAIASH</td>
-      <td>Para Athletics - Men's Shot Put - F40 Final</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">