diff --git a/src/pages/geg-2024/berechnungstabellen/index.astro b/src/pages/geg-2024/berechnungstabellen/index.astro
index e53a32d5..0278cf0d 100644
--- a/src/pages/geg-2024/berechnungstabellen/index.astro
+++ b/src/pages/geg-2024/berechnungstabellen/index.astro
@@ -2104,34 +2104,41 @@ import Layout from "#layouts/Layout.astro";
                         Bestimmung der mittleren Belastung in Anlagenteilbereichen
                       </th>
                     </tr> 
-                  <tr>
-                    <th colspan="2" class="border border-gray-300 px-4 py-2 text-center">Energiebedarf [kWh/a]</th>
+                    <tr>
+                      <th colspan="1" class="border border-gray-300 px-4 py-2 text-center">Objekt:</th>
+                      <th colspan="9" class="border border-gray-300 px-4 py-2 text-center bg-yellow-100"></th>
+                    </tr>
+                    <tr>
+                      <th colspan="1" class="border border-gray-300 px-4 py-2 text-center">Anlage:</th>
+                      <th colspan="1" class="border border-gray-300 px-4 py-2 text-center bg-yellow-100"></th>
+                      <th colspan="1" class="border border-gray-300 px-4 py-2 text-center">Q<sub>h,b</sub> [kWh/a]<br>aus Tabelle A.12:</th>
+                      <th colspan="1" class="border border-gray-300 px-4 py-2 text-center bg-yellow-100"></th>
+                      <th colspan="1" class="border border-gray-300 px-4 py-2 text-center">t<sub>h,m</sub> [h/a]<br>aus Tabelle A.12:</th>
+                      <th colspan="1" class="border border-gray-300 px-4 py-2 text-center bg-yellow-100"></th>
+                      <th colspan="1" class="border border-gray-300 px-4 py-2 text-center">Φ<sub>h,max</sub>  [W]<br>aus Tabelle A.6:</th>
+                      <th colspan="1" class="border border-gray-300 px-4 py-2 text-center bg-yellow-100"></th>
+                    </tr>
+                    <tr>
                     <th colspan="2" class="border border-gray-300 px-4 py-2 text-center">Übergabe</th>
                     <th colspan="2" class="border border-gray-300 px-4 py-2 text-center">Verteilung</th>
                     <th colspan="2" class="border border-gray-300 px-4 py-2 text-center">Speicherung</th>
                     <th colspan="2" class="border border-gray-300 px-4 py-2 text-center">Erzeugung</th>
                   </tr>
                   <tr>
-                    <th colspan="1" class="border border-gray-300 px-4 py-2 text-center">Objekt:</th>
-                    <th colspan="9" class="border border-gray-300 px-4 py-2 text-center bg-yellow-100"></th>
-                  </tr>
-                  <tr>
-                    <th class="border border-gray-300 px-4 py-2 text-center">Anlage</th>
-                    <th class="border border-gray-300 px-4 py-2 text-center">Nutzenergiebedarf<br>Q<sub>nutz</sub> = Q<sub>b</sub> [kWh/a]</th>
-                    <th class="border border-gray-300 px-4 py-2 text-center">β<sub>ce</sub></th>
-                    <th class="border border-gray-300 px-4 py-2 text-center">e<sub>ce</sub></th>
-                    <th class="border border-gray-300 px-4 py-2 text-center">β<sub>d</sub></th>
-                    <th class="border border-gray-300 px-4 py-2 text-center">e<sub>d</sub></th>
-                    <th class="border border-gray-300 px-4 py-2 text-center">β<sub>s</sub></th>
-                    <th class="border border-gray-300 px-4 py-2 text-center">e<sub>s</sub></th>
-                    <th class="border border-gray-300 px-4 py-2 text-center">β<sub>g,n</sub></th>
-                    <th class="border border-gray-300 px-4 py-2 text-center">e<sub>g,n</sub></th>
+                    <th class="border border-gray-300 px-4 py-2 text-center">β<sub>h,ce</sub> =<br>(Q<sub>h,b</sub> / t<sub>h,m</sub> · Φ<sub>h,max</sub>) · 1000</th>
+                    <th class="border border-gray-300 px-4 py-2 text-center">e<sub>h,ce</sub><br>aus Tabellen<br>20 - 25</th></th>
+                    <th class="border border-gray-300 px-4 py-2 text-center">β<sub>h,d</sub> =<br>β<sub>h,ce</sub> · e<sub></sub>h,ce</sub> · f<sub>hydr</sub></th>
+                    <th class="border border-gray-300 px-4 py-2 text-center">e<sub>h,d</sub><br>aus Tabellen<br>30 - 36</th></th>
+                    <th class="border border-gray-300 px-4 py-2 text-center">β<sub>h,s</sub> =<br>β<sub>h,d</sub> · e<sub>h,d</sub></th>
+                    <th class="border border-gray-300 px-4 py-2 text-center">e<sub>h,s</sub><br>aus Tabellen<br>50-52</th>
+                    <th class="border border-gray-300 px-4 py-2 text-center">β<sub>h,g</sub> =<br>β<sub>h,s · e<sub>h,s</sub></sub></th>
+                    <th class="border border-gray-300 px-4 py-2 text-center">e<sub>h,g</sub><br>für Kessel aus<br>Tabelle 77-81</th>
                   </tr>
                 </thead>
+                </div>
+                <span class="inline-block ml-2"></span>
                 <tbody>
                   <tr class="h-10">
-                    <td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
-                    <td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
                     <td class="border-2 border-gray-600 px-4 py-2"></td>
                     <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
                     <td class="border-2 border-gray-600 px-4 py-2"></td>
@@ -2142,56 +2149,147 @@ import Layout from "#layouts/Layout.astro";
                     <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
                   </tr>
                   <tr class="h-10">
-                    <td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
-                    <td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
-                    <td class="border-2 border-gray-600 px-4 py-2"></td>
-                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
-                    <td class="border-2 border-gray-600 px-4 py-2"></td>
-                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
-                    <td class="border-2 border-gray-600 px-4 py-2"></td>
-                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
-                    <td class="border-2 border-gray-600 px-4 py-2"></td>
-                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
-                  </tr>
-                  <tr class="h-10">
-                    <td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
-                    <td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
-                    <td class="border-2 border-gray-600 px-4 py-2"></td>
-                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
-                    <td class="border-2 border-gray-600 px-4 py-2"></td>
-                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
-                    <td class="border-2 border-gray-600 px-4 py-2"></td>
-                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
-                    <td class="border-2 border-gray-600 px-4 py-2"></td>
-                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
-                  </tr>
-                  <tr class="h-10">
-                    <td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
-                    <td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
-                    <td class="border-2 border-gray-600 px-4 py-2"></td>
-                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
-                    <td class="border-2 border-gray-600 px-4 py-2"></td>
-                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
-                    <td class="border-2 border-gray-600 px-4 py-2"></td>
-                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
-                    <td class="border-2 border-gray-600 px-4 py-2"></td>
-                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
-                  </tr>
-                  <tr class="h-10">
-                    <td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
-                    <td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
-                    <td class="border-2 border-gray-600 px-4 py-2"></td>
-                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
-                    <td class="border-2 border-gray-600 px-4 py-2"></td>
-                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
-                    <td class="border-2 border-gray-600 px-4 py-2"></td>
-                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
-                    <td class="border-2 border-gray-600 px-4 py-2"></td>
-                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
+                    <td colspan="10" class="border border-gray-300 px-4 py-2">Treten unterschiedliche Übergabesysteme und/oder 
+                      unterschiedliche Verteilsysteme in dem gleichen Gebäude auf, wird zur Aufteilung des Bedarfs die Fläche 
+                      als Bezugsgröße herangezogen und mehrere Zeilen für die Anlagentechnik angelegt.<br><br>
+                      Wenn kein Pufferspeicher vorhanden ist: <b>e<sub>h,s</sub> = 1</b><br><br>
+                      Zu beachten bei vorhandenem Pufferspeicher:<br>
+                      <b>β<sub>h,g</sub> = 1</b> und die Aufwandszahl für Verteilung muss korrigiert werden: <b>e<sub>h,d,korr</sub> = (e<sub>h,d</sub> - 1) · (8760/t<sub>h,r,L</sub>) + 1</b> (t<sub>h,r,L</sub> siehe Tabelle 13)<br><br>
+                      Handelt es sich bei den Wärmeerzeugern um Kessel, sind noch folgende zwei Korrekturen vorzunehmen:<br><br>
+                      Korrektur der Aufwandszahl für Erzeugung für Heizung mit: <b>e<sub>h,g,korr</sub> = (e<sub>h,g</sub> - 1) &middot; t<sub>a</sub> / t<sub>h,rL</sub> + 1</b><br>
+                      Korrektur der Aufwandszahl für Erzeugung für Trinkwarmwassererwärmung: <b>e<sub>w,g,korr</sub> = (e<sub>w,g</sub> - 1) &middot; t<sub>a</sub> / t<sub>h,rL</sub> + 1</b>
+                    </td>
                   </tr>
                 </tbody>
               </table>
             </div>
           
+            <div class="overflow-x-auto mt-16">
+              <table class="table-auto border-collapse border border-gray-300 w-full text-sm">
+                <thead>
+                  <tr class="bg-gray-200 text-left">
+                    <th colspan="6" class="border border-gray-300 p-2">
+                      <h2>Tabelle A.15 — Anlage gesamt</h2>
+                    </th>
+                    <tr class="text-center">
+                      <tr class="bg-gray-200 text-left">
+                        <th colspan="6" class="border border-gray-300 p-2 text-xl">
+                          Berechnung der Aufwandszahlen
+                        </th>
+                      </tr> 
+                    <tr>
+                      <th class="border border-gray-300 px-4 py-2">Übergabe</th>
+                      <th class="border border-gray-300 px-4 py-2">Verteilung</th>
+                      <th class="border border-gray-300 px-4 py-2">Speicherung</th>
+                      <th class="border border-gray-300 px-4 py-2">
+                        Flächenbezogene<br>Erzeugernutzwärmeabgabe
+                      </th>
+                      <th class="border border-gray-300 px-4 py-2">Erzeugung</th>
+                      <th class="border border-gray-300 px-4 py-2">Gesamt</th>
+                    </tr>
+                    <tr>
+                      <th class="border border-gray-300 px-4 py-2">e<sub>ce</sub></th>
+                      <th class="border border-gray-300 px-4 py-2">e<sub>d</sub></th>
+                      <th class="border border-gray-300 px-4 py-2">e<sub>s</sub></th>
+                      <th class="border border-gray-300 px-4 py-2">
+                        q<sub>outg</sub><sup>a</sup> = Q<sub>nutz</sub> / A<sub>NGF</sub> &middot; e<sub>ce</sub> &middot; e<sub>d</sub> &middot; e<sub>s</sub>
+                      <br>[kWh/m²a]</th>
+                      <th class="border border-gray-300 px-4 py-2">e<sub>g</sub></th>
+                      <th class="border border-gray-300 px-4 py-2">
+                        e<sub>ges</sub> = e<sub>ce</sub> &middot; e<sub>d</sub> &middot; e<sub>s</sub> &middot; e<sub>g</sub>
+                      </th>
+                    </tr>
+                </thead>
+                </div>
+                <tbody>
+                  <tr class="h-10">
+                    <td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
+                    <td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
+                    <td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
+                    <td class="border-2 border-gray-600 px-4 py-2"></td>
+                    <td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
+                    <td class="border-2 border-gray-600 px-4 py-2"></td>
+                  </tr>
+                  <tr class="h-10">
+                    <td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
+                    <td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
+                    <td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
+                    <td class="border-2 border-gray-600 px-4 py-2"></td>
+                    <td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
+                    <td class="border-2 border-gray-600 px-4 py-2"></td>
+                  </tr>
+                  <tr class="h-10">
+                    <td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
+                    <td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
+                    <td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
+                    <td class="border-2 border-gray-600 px-4 py-2"></td>
+                    <td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
+                    <td class="border-2 border-gray-600 px-4 py-2"></td>
+                  </tr>
+                  <tr class="h-10">
+                    <td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
+                    <td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
+                    <td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
+                    <td class="border-2 border-gray-600 px-4 py-2"></td>
+                    <td class="border border-gray-300 px-4 py-2 bg-yellow-100"></td>
+                    <td class="border-2 border-gray-600 px-4 py-2"></td>
+                  </tr>
+                </tbody>
+                <thead>
+                  <tr class="bg-gray-200 text-left">
+                    <tr class="text-center">
+                      <tr class="bg-gray-200 text-left">
+                        <th colspan="6" class="border border-gray-300 p-2 text-xl">
+                          Berechnung der Hilfsenergie
+                        </th>
+                      </tr> 
+                      <tr>
+                        <th class="border border-gray-300 px-4 py-2">W<sub>ce</sub><br>[kWh/a]</th>
+                        <th class="border border-gray-300 px-4 py-2">W<sub>d</sub><br>[kWh/a]</th>
+                        <th class="border border-gray-300 px-4 py-2">W<sub>s</sub><br>[kWh/a]</th>
+                        <th class="border border-gray-300 px-4 py-2"></th>
+                        <th class="border border-gray-300 px-4 py-2">W<sub>g</sub><br>[kWh/a]</th>
+                        <th class="border border-gray-300 px-4 py-2">
+                          W<sub>ges</sub> = W<sub>ce</sub> + W<sub>d</sub> + W<sub>s</sub> + W<sub>g</sub><br>[kWh/a]
+                        </th>
+                      </tr>
+                </thead>
+                </div>
+                <tbody>
+                  <tr class="h-10">
+                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
+                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
+                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
+                    <td class="border border-gray-300 px-4 py-2"></td>
+                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
+                    <td class="border-2 border-gray-600 px-4 py-2"></td>
+                  </tr>
+                  <tr class="h-10">
+                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
+                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
+                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
+                    <td class="border border-gray-300 px-4 py-2"></td>
+                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
+                    <td class="border-2 border-gray-600 px-4 py-2"></td>
+                  </tr>
+                  <tr class="h-10">
+                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
+                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
+                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
+                    <td class="border border-gray-300 px-4 py-2"></td>
+                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
+                    <td class="border-2 border-gray-600 px-4 py-2"></td>
+                  </tr>
+                  <tr class="h-10">
+                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
+                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
+                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
+                    <td class="border border-gray-300 px-4 py-2"></td>
+                    <td class="border border-gray-300 px-4 py-2 bg-blue-100"></td>
+                    <td class="border-2 border-gray-600 px-4 py-2"></td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
 
 </Layout>
\ No newline at end of file