diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json
index 9bc319e..649054c 100644
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@@ -386,69 +386,14 @@
     }
   ],
   "SpecialDays": [
-    {
-      "ped_id": 11,
-      "ped_label": "Mariae Empfaengnis",
-      "ped_date_start": "2023-12-08",
-      "ped_date_end": "2023-12-08",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 13,
-      "ped_label": "Christtag",
-      "ped_date_start": "2023-12-25",
-      "ped_date_end": "2023-12-25",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 14,
-      "ped_label": "Stefanitag",
-      "ped_date_start": "2023-12-26",
-      "ped_date_end": "2023-12-26",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2016,
-      "ped_label": "Neujahr",
-      "ped_date_start": "2024-01-01",
-      "ped_date_end": "2024-01-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2021,
-      "ped_label": "Heilig Drei Koenige",
-      "ped_date_start": "2024-01-06",
-      "ped_date_end": "2024-01-06",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2022,
-      "ped_label": "Ostermontag",
-      "ped_date_start": "2024-04-01",
-      "ped_date_end": "2024-04-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2023,
-      "ped_label": "Ostersonntag",
-      "ped_date_start": "2024-03-31",
-      "ped_date_end": "2024-03-31",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2024
-    },
     {
       "ped_id": 2024,
       "ped_label": "Staatsfeiertag",
       "ped_date_start": "2024-05-01",
       "ped_date_end": "2024-05-01",
       "ped_period_special_day_id": 1,
-      "ped_year": 0
+      "ped_year": 0,
+      "comment_ped_year": "check year if 0"
     },
     {
       "ped_id": 2025,
@@ -456,7 +401,17 @@
       "ped_date_start": "2024-05-09",
       "ped_date_end": "2024-05-09",
       "ped_period_special_day_id": 1,
-      "ped_year": 2024
+      "ped_year": 0,
+      "comment_ped_year": "check year if 0"
+    },
+    {
+      "ped_id": 2060,
+      "ped_label": "Pfingst Sonntag",
+      "ped_date_start": "2024-05-19",
+      "ped_date_end": "2024-05-19",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0,
+      "comment_ped_year": "check year if 0"
     },
     {
       "ped_id": 2026,
@@ -464,7 +419,8 @@
       "ped_date_start": "2024-05-20",
       "ped_date_end": "2024-05-20",
       "ped_period_special_day_id": 1,
-      "ped_year": 2024
+      "ped_year": 0,
+      "comment_ped_year": "check year if 0"
     },
     {
       "ped_id": 2027,
@@ -472,7 +428,8 @@
       "ped_date_start": "2024-05-30",
       "ped_date_end": "2024-05-30",
       "ped_period_special_day_id": 1,
-      "ped_year": 2024
+      "ped_year": 0,
+      "comment_ped_year": "check year if 0"
     },
     {
       "ped_id": 2028,
@@ -480,7 +437,8 @@
       "ped_date_start": "2024-08-15",
       "ped_date_end": "2024-08-15",
       "ped_period_special_day_id": 1,
-      "ped_year": 0
+      "ped_year": 0,
+      "comment_ped_year": "check year if 0"
     },
     {
       "ped_id": 2029,
@@ -488,7 +446,8 @@
       "ped_date_start": "2024-10-26",
       "ped_date_end": "2024-10-26",
       "ped_period_special_day_id": 1,
-      "ped_year": 0
+      "ped_year": 0,
+      "comment_ped_year": "check year if 0"
     },
     {
       "ped_id": 2030,
@@ -496,7 +455,8 @@
       "ped_date_start": "2024-11-01",
       "ped_date_end": "2024-11-01",
       "ped_period_special_day_id": 1,
-      "ped_year": 0
+      "ped_year": 0,
+      "comment_ped_year": "check year if 0"
     },
     {
       "ped_id": 2031,
@@ -504,7 +464,8 @@
       "ped_date_start": "2024-08-12",
       "ped_date_end": "2024-08-12",
       "ped_period_special_day_id": 1,
-      "ped_year": 0
+      "ped_year": 0,
+      "comment_ped_year": "check year if 0"
     },
     {
       "ped_id": 2032,
@@ -512,7 +473,8 @@
       "ped_date_start": "2024-12-25",
       "ped_date_end": "2024-12-25",
       "ped_period_special_day_id": 1,
-      "ped_year": 0
+      "ped_year": 0,
+      "comment_ped_year": "check year if 0"
     },
     {
       "ped_id": 2034,
@@ -520,135 +482,8 @@
       "ped_date_start": "2024-12-26",
       "ped_date_end": "2024-12-26",
       "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2035,
-      "ped_label": "Neujahr",
-      "ped_date_start": "2025-01-01",
-      "ped_date_end": "2025-01-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0 
-    },
-    {
-      "ped_id": 2036,
-      "ped_label": "Heilig Drei Koenige",
-      "ped_date_start": "2025-06-01",
-      "ped_date_end": "2025-06-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2037,
-      "ped_label": "Ostermontag",
-      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2025-04-21",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2039,
-      "ped_label": "Ostersonntag",
-      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2025-04-20",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2038,
-      "ped_label": "Staatsfeiertag",
-      "ped_date_start": "2025-05-01",
-      "ped_date_end": "2025-05-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2050,
-      "ped_label": "Christi Himmelfahrt",
-      "ped_date_start": "2025-05-29",
-      "ped_date_end": "2025-05-29",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2051,
-      "ped_label": "Pfingstmontag",
-      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2025-06-09",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2052,
-      "ped_label": "Fronlaeichnam",
-      "ped_date_start": "2025-06-19",
-      "ped_date_end": "2025-06-19",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2053,
-      "ped_label": "Mariae Himmelfahrt",
-      "ped_date_start": "2025-08-15",
-      "ped_date_end": "2025-08-15",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2054,
-      "ped_label": "Nationalfeiertag",
-      "ped_date_start": "2025-10-26",
-      "ped_date_end": "2025-10-26",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2055,
-      "ped_label": "Allerheiligen",
-      "ped_date_start": "2025-11-01",
-      "ped_date_end": "2025-11-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2056,
-      "ped_label": "Mariae Empfaengnis",
-      "ped_date_start": "2025-12-08",
-      "ped_date_end": "2025-12-08",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2057,
-      "ped_label": "Christtag",
-      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-12-25",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2058,
-      "ped_label": "Stefanitag",
-      "ped_date_start": "2025-12-26",
-      "ped_date_end": "2025-12-26",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2059,
-      "ped_label": "Neujahr",
-      "ped_date_start": "2026-01-01",
-      "ped_date_end": "2026-01-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2060,
-      "ped_label": "Heilige Drei Koenige",
-      "ped_date_start": "2026-01-06",
-      "ped_date_end": "2026-01-06",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
+      "ped_year": 0,
+      "comment_ped_year": "check year if 0"
     }
   ],
   "PeriodYear": [