diff --git a/Abrechnung/module.php b/Abrechnung/module.php
index db45ecf..68d3e39 100644
--- a/Abrechnung/module.php
+++ b/Abrechnung/module.php
@@ -268,130 +268,72 @@ private function GetValueAt(int $varId, int $timestamp, bool $nearestAfter = tru
 
 private function AddMeterToPDFRow($meter, $tariffs, $from, $to, $type)
 {
+    $archiveID = @IPS_GetInstanceListByModuleID('{43192F0B-135B-4CE7-A0A7-1475603F3060}')[0];
+    if (!$archiveID || !IPS_VariableExists($meter['var_consumption'])) {
+        IPS_LogMessage('Abrechnung', "❌ AddMeterToPDFRow: Archiv oder Variable {$meter['var_consumption']} nicht gefunden");
+        return ['row' => '', 'value' => 0];
+    }
+
     $rows = '';
     $totalCost = 0.0;
 
-    $varId = $meter['var_consumption'];
-    if (!IPS_VariableExists($varId)) {
-        IPS_LogMessage('Abrechnung', "❌ Variable {$varId} für {$meter['name']} nicht gefunden");
+    // Tarife nach Startzeit sortieren
+    usort($tariffs, fn($a, $b) => strtotime($a['start']) <=> strtotime($b['start']));
+
+    // Filter: nur Tarife des Typs (z. B. Strombezug, Warmwasser)
+    $relevantTariffs = array_filter($tariffs, fn($t) => strtolower($t['unit_type']) == strtolower($type));
+    if (empty($relevantTariffs)) {
+        IPS_LogMessage('Abrechnung', "⚠ Keine Tarife für Typ $type gefunden");
         return ['row' => '', 'value' => 0];
     }
 
-    // --- Relevante Tarife nach Typ filtern ---
-    $filteredTariffs = array_filter($tariffs, function ($t) use ($type) {
-        $tariffType = strtolower(trim($t['unit_type'] ?? ''));
-        $typeNorm = strtolower(trim($type));
+    // Iteriere über alle Tarifabschnitte, die den Abrechnungszeitraum ganz oder teilweise überlappen
+    foreach ($relevantTariffs as $t) {
+        $tStart = strtotime($t['start']);
+        $tEnd   = strtotime($t['end']);
 
-        $map = [
-            'strombezug' => ['strom', 'strombezug', 'stromzähler', 'stromverbrauch'],
-            'warmwasser' => ['warmwasser', 'wasser', 'hww'],
-            'kaltwasser' => ['kaltwasser', 'wasser', 'kww'],
-            'wärme'      => ['wärme', 'heizung', 'heat']
-        ];
-        return in_array($tariffType, $map[$typeNorm] ?? []) || $tariffType === $typeNorm;
-    });
+        // Überlappung mit Abrechnungszeitraum prüfen
+        if ($tEnd < $from || $tStart > $to) continue;
 
-    if (empty($filteredTariffs)) {
-        IPS_LogMessage('Abrechnung', "⚠ Keine passenden Tarife für $type gefunden");
-        return ['row' => '', 'value' => 0];
-    }
+        // Effektive Tarifperiode innerhalb des Abrechnungszeitraums bestimmen
+        $periodStart = max($from, $tStart);
+        $periodEnd   = min($to, $tEnd);
 
-    // --- Tarife sicher in Zeiträume umwandeln ---
-    foreach ($filteredTariffs as &$t) {
-        $t['start_ts'] = is_numeric($t['start']) ? intval($t['start']) : strtotime($t['start']);
-        $t['end_ts']   = is_numeric($t['end'])   ? intval($t['end'])   : strtotime($t['end']);
-        if (!$t['start_ts'] || !$t['end_ts']) {
-            IPS_LogMessage('Abrechnung', "⚠ Ungültiger Tarifzeitraum: " . json_encode($t));
-            continue;
-        }
-    }
-    unset($t);
+        // Archivwerte zu Beginn und Ende der Teilperiode holen
+        $valueStart = $this->GetValueAt($meter['var_consumption'], $periodStart, false);
+        $valueEnd   = $this->GetValueAt($meter['var_consumption'], $periodEnd, true);
 
-    // Sortiere Tarife nach Startzeit
-    usort($filteredTariffs, fn($a, $b) => $a['start_ts'] <=> $b['start_ts']);
-
-    $current = $from;
-
-    while ($current < $to) {
-        // Finde aktiven Tarif für diesen Zeitpunkt
-        $activeTariff = null;
-        foreach ($filteredTariffs as $t) {
-            if ($t['start_ts'] <= $current && $current <= $t['end_ts']) {
-                $activeTariff = $t;
-                break;
-            }
-        }
-
-        // Wenn kein aktiver Tarif, nimm nächsten oder rechne 0 Rp
-        if (!$activeTariff) {
-            $nextStart = $to;
-            foreach ($filteredTariffs as $t) {
-                if ($t['start_ts'] > $current && $t['start_ts'] < $nextStart) {
-                    $nextStart = $t['start_ts'];
-                }
-            }
-            $segmentEnd = min($nextStart, $to);
-            $tariffPrice = 0.0;
-            $tariffLabel = 'kein Tarif';
-        } else {
-            $segmentEnd = min($activeTariff['end_ts'], $to);
-            $tariffPrice = floatval($activeTariff['price']);
-            $tariffLabel = number_format($tariffPrice, 2);
-        }
-
-        // --- Verbrauch für diesen Zeitraum ---
-        $startVal = $this->GetValueAt($varId, $current, true);
-        $endVal   = $this->GetValueAt($varId, $segmentEnd, true);
-        if ($startVal === null || $endVal === null) {
-            IPS_LogMessage('Abrechnung', "⚠ Keine Werte für {$meter['name']} im Zeitraum " . date('d.m.Y H:i', $current) . " - " . date('d.m.Y H:i', $segmentEnd));
-            $current = $segmentEnd + 1;
+        if ($valueStart === null || $valueEnd === null) {
+            IPS_LogMessage('Abrechnung', "⚠ Keine gültigen Werte für {$meter['name']} zwischen $periodStart und $periodEnd");
             continue;
         }
 
-        $diff = max(0, $endVal - $startVal);
-        $costCHF = round(($tariffPrice / 100) * $diff, 2);
-        $totalCost += $costCHF;
+        // Verbrauch & Kosten berechnen
+        $verbrauch = max(0, $valueEnd - $valueStart);
+        $tarifRp   = floatval($t['price']);
+        $kostenCHF = round(($tarifRp / 100) * $verbrauch, 2);
+        $totalCost += $kostenCHF;
 
-        // --- Ausgabezeile ---
+        // Tabellenzeile erzeugen
         $rows .= "
         <tr>
             <td>{$meter['name']}</td>
-            <td>$type</td>
-            <td>" . date('d.m.Y H:i', $current) . "</td>
-            <td>" . date('d.m.Y H:i', $segmentEnd) . "</td>
-            <td>" . number_format($startVal, 2) . "</td>
-            <td>" . number_format($endVal, 2) . "</td>
-            <td>" . number_format($diff, 2) . "</td>
-            <td>" . $tariffLabel . "</td>
-            <td>" . number_format($costCHF, 2) . "</td>
+            <td>{$type}</td>
+            <td>" . date('d.m.Y H:i', $periodStart) . "</td>
+            <td>" . date('d.m.Y H:i', $periodEnd) . "</td>
+            <td>" . number_format($valueStart, 2) . "</td>
+            <td>" . number_format($valueEnd, 2) . "</td>
+            <td>" . number_format($verbrauch, 2) . "</td>
+            <td>" . number_format($tarifRp, 2) . "</td>
+            <td>" . number_format($kostenCHF, 2) . "</td>
         </tr>";
-
-        $current = $segmentEnd + 1;
     }
 
-    // --- Falls nichts berechnet wurde (z. B. fehlende Tarife) ---
-    if ($rows == '') {
-        $startVal = $this->GetValueAt($varId, $from, false);
-        $endVal   = $this->GetValueAt($varId, $to, true);
-        $diff = max(0, $endVal - $startVal);
-        $rows = "
-        <tr>
-            <td>{$meter['name']}</td>
-            <td>$type</td>
-            <td>" . date('d.m.Y H:i', $from) . "</td>
-            <td>" . date('d.m.Y H:i', $to) . "</td>
-            <td>" . number_format($startVal, 2) . "</td>
-            <td>" . number_format($endVal, 2) . "</td>
-            <td>" . number_format($diff, 2) . "</td>
-            <td>0</td>
-            <td>0.00</td>
-        </tr>";
+    if ($rows === '') {
+        $rows = "<tr><td colspan='9'>Keine Tarifabschnitte im Zeitraum gefunden</td></tr>";
     }
 
     return ['row' => $rows, 'value' => $totalCost];
 }
 
-
-
-
 }
\ No newline at end of file