diff --git a/etc/psa_tariff/tariff05.json b/etc/psa_tariff/tariff05.json
index ded5414..d96d2ed 100644
--- a/etc/psa_tariff/tariff05.json
+++ b/etc/psa_tariff/tariff05.json
@@ -1,7 +1,12 @@
 {
   "Project" :   "SV Bad Neuenahr",
-  "Version" :   "1.0.0",
+  "Version" :   "1.0.0+2024-04-29T16:15:20",
   "Info"    :   "Langzeitparktarif",
+  "comment_1": 	"20mins free (broetchentaste)",
+  "comment_2": 	"every following 20mins: 0,40 euro",
+  "comment_3": 	"24h-ticket: 5,00 euro",
+  "comment_4":  "3x 24h ticket: 12,50 euro",
+  "comment_5":  "7x 24h ticket: 25,00 euro",
   "Currency": [
     {
       "pcu_id": 2,
@@ -41,7 +46,9 @@
       "pop_max_time": 10080,
       "pop_min_price": 0,
       "pop_carry_over": 0,
-      "pop_daily_card_price": 500
+      "pop_daily_card_price": 500,
+      "pop_business_hours": 163584,
+      "comment_1": "163584 = 0x27F00 = 10|0111|1111|0000|0000 -> all days with restricted hours"
     }
   ],
   "PaymentRate": [
@@ -113,313 +120,18 @@
     {
       "pra_payment_option_id": 1049,
       "pra_payment_unit_id": 14,
-      "pra_price": 520
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 15,
-      "pra_price": 560
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 16,
-      "pra_price": 600
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 17,
-      "pra_price": 640
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 18,
-      "pra_price": 680
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 19,
-      "pra_price": 720
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 20,
-      "pra_price": 760
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 21,
-      "pra_price": 800
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 22,
-      "pra_price": 840
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 23,
-      "pra_price": 880
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 24,
-      "pra_price": 920
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 25,
-      "pra_price": 960
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 26,
-      "pra_price": 1000
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 27,
-      "pra_price": 1040
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 28,
-      "pra_price": 1080
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 29,
-      "pra_price": 1120
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 30,
-      "pra_price": 1160
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 31,
-      "pra_price": 1200
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 32,
-      "pra_price": 1240
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 33,
-      "pra_price": 1280
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 34,
-      "pra_price": 1320
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 35,
-      "pra_price": 1360
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 36,
-      "pra_price": 1400
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 37,
-      "pra_price": 1440
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 38,
-      "pra_price": 1480
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 39,
-      "pra_price": 1520
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 40,
-      "pra_price": 1560
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 41,
-      "pra_price": 1600
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 42,
-      "pra_price": 1640
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 43,
-      "pra_price": 1680
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 44,
-      "pra_price": 1720
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 45,
-      "pra_price": 1760
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 46,
-      "pra_price": 1800
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 47,
-      "pra_price": 1840
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 48,
-      "pra_price": 1880
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 49,
-      "pra_price": 1920
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 50,
-      "pra_price": 1960
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 51,
-      "pra_price": 2000
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 52,
-      "pra_price": 2040
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 53,
-      "pra_price": 2080
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 54,
-      "pra_price": 2120
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 55,
-      "pra_price": 2160
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 56,
-      "pra_price": 2200
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 57,
-      "pra_price": 2240
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 58,
-      "pra_price": 2280
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 59,
-      "pra_price": 2320
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 60,
-      "pra_price": 2360
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 61,
-      "pra_price": 2400
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 62,
-      "pra_price": 2440
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 63,
-      "pra_price": 2480
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 64,
-      "pra_price": 2520
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 65,
-      "pra_price": 2560
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 66,
-      "pra_price": 2600
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 67,
-      "pra_price": 2640
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 68,
-      "pra_price": 2680
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 69,
-      "pra_price": 2720
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 70,
-      "pra_price": 2760
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 71,
-      "pra_price": 2800
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 72,
-      "pra_price": 2840
-    },
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 73,
       "pra_price": 500,
       "pra_comment": "24h-ticket"
     },
     {
       "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 74,
+      "pra_payment_unit_id": 15,
       "pra_price": 1250,
       "pra_comment": "3x24h-ticket"
     },
     {
       "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 75,
+      "pra_payment_unit_id": 16,
       "pra_price": 2500,
       "pra_comment": "7x24h-ticket"
     }
@@ -492,312 +204,17 @@
     },
     {
       "pun_id": 14,
-      "pun_label": "280 min",
-      "pun_duration": 280
+      "pun_label": "24h",
+      "pun_duration": 1440
     },
     {
       "pun_id": 15,
-      "pun_label": "300 min",
-      "pun_duration": 300
-    },
-    {
-      "pun_id": 16,
-      "pun_label": "320 min",
-      "pun_duration": 320
-    },
-    {
-      "pun_id": 17,
-      "pun_label": "340 min",
-      "pun_duration": 340
-    },
-    {
-      "pun_id": 18,
-      "pun_label": "360 min",
-      "pun_duration": 360
-    },
-    {
-      "pun_id": 19,
-      "pun_label": "380 min",
-      "pun_duration": 380
-    },
-    {
-      "pun_id": 20,
-      "pun_label": "400 min",
-      "pun_duration": 400
-    },
-    {
-      "pun_id": 21,
-      "pun_label": "420 min",
-      "pun_duration": 420
-    },
-    {
-      "pun_id": 22,
-      "pun_label": "440 min",
-      "pun_duration": 440
-    },
-    {
-      "pun_id": 23,
-      "pun_label": "460 min",
-      "pun_duration": 460
-    },
-    {
-      "pun_id": 24,
-      "pun_label": "480 min",
-      "pun_duration": 480
-    },
-    {
-      "pun_id": 25,
-      "pun_label": "500 min",
-      "pun_duration": 500
-    },
-    {
-      "pun_id": 26,
-      "pun_label": "520 min",
-      "pun_duration": 520
-    },
-    {
-      "pun_id": 27,
-      "pun_label": "540 min",
-      "pun_duration": 540
-    },
-    {
-      "pun_id": 28,
-      "pun_label": "560 min",
-      "pun_duration": 560
-    },
-    {
-      "pun_id": 29,
-      "pun_label": "580 min",
-      "pun_duration": 580
-    },
-    {
-      "pun_id": 30,
-      "pun_label": "600 min",
-      "pun_duration": 600
-    },
-    {
-      "pun_id": 31,
-      "pun_label": "620 min",
-      "pun_duration": 620
-    },
-    {
-      "pun_id": 32,
-      "pun_label": "640 min",
-      "pun_duration": 640
-    },
-    {
-      "pun_id": 33,
-      "pun_label": "660 min",
-      "pun_duration": 660
-    },
-    {
-      "pun_id": 34,
-      "pun_label": "680 min",
-      "pun_duration": 680
-    },
-    {
-      "pun_id": 35,
-      "pun_label": "700 min",
-      "pun_duration": 700
-    },
-    {
-      "pun_id": 36,
-      "pun_label": "720 min",
-      "pun_duration": 720
-    },
-    {
-      "pun_id": 37,
-      "pun_label": "740 min",
-      "pun_duration": 740
-    },
-    {
-      "pun_id": 38,
-      "pun_label": "760 min",
-      "pun_duration": 760
-    },
-    {
-      "pun_id": 39,
-      "pun_label": "780 min",
-      "pun_duration": 780
-    },
-    {
-      "pun_id": 40,
-      "pun_label": "800 min",
-      "pun_duration": 800
-    },
-    {
-      "pun_id": 41,
-      "pun_label": "820 min",
-      "pun_duration": 820
-    },
-    {
-      "pun_id": 42,
-      "pun_label": "840 min",
-      "pun_duration": 840
-    },
-    {
-      "pun_id": 43,
-      "pun_label": "860 min",
-      "pun_duration": 860
-    },
-    {
-      "pun_id": 44,
-      "pun_label": "880 min",
-      "pun_duration": 880
-    },
-    {
-      "pun_id": 45,
-      "pun_label": "900 min",
-      "pun_duration": 900
-    },
-    {
-      "pun_id": 46,
-      "pun_label": "920 min",
-      "pun_duration": 920
-    },
-    {
-      "pun_id": 47,
-      "pun_label": "940 min",
-      "pun_duration": 940
-    },
-    {
-      "pun_id": 48,
-      "pun_label": "960 min",
-      "pun_duration": 960
-    },
-    {
-      "pun_id": 49,
-      "pun_label": "980 min",
-      "pun_duration": 980
-    },
-    {
-      "pun_id": 50,
-      "pun_label": "1000 min",
-      "pun_duration": 1000
-    },
-    {
-      "pun_id": 51,
-      "pun_label": "1020 min",
-      "pun_duration": 1020
-    },
-    {
-      "pun_id": 52,
-      "pun_label": "1040 min",
-      "pun_duration": 1040
-    },
-    {
-      "pun_id": 53,
-      "pun_label": "1060 min",
-      "pun_duration": 1060
-    },
-    {
-      "pun_id": 54,
-      "pun_label": "1080 min",
-      "pun_duration": 1080
-    },
-    {
-      "pun_id": 55,
-      "pun_label": "1100 min",
-      "pun_duration": 1100
-    },
-    {
-      "pun_id": 56,
-      "pun_label": "1120 min",
-      "pun_duration": 1120
-    },
-    {
-      "pun_id": 57,
-      "pun_label": "1140 min",
-      "pun_duration": 1140
-    },
-    {
-      "pun_id": 58,
-      "pun_label": "1160 min",
-      "pun_duration": 1160
-    },
-    {
-      "pun_id": 59,
-      "pun_label": "1180 min",
-      "pun_duration": 1180
-    },
-    {
-      "pun_id": 60,
-      "pun_label": "1200 min",
-      "pun_duration": 1200
-    },
-    {
-      "pun_id": 61,
-      "pun_label": "1220 min",
-      "pun_duration": 1220
-    },
-    {
-      "pun_id": 62,
-      "pun_label": "1240 min",
-      "pun_duration": 1240
-    },
-    {
-      "pun_id": 63,
-      "pun_label": "1260 min",
-      "pun_duration": 1260
-    },
-    {
-      "pun_id": 64,
-      "pun_label": "1280 min",
-      "pun_duration": 1280
-    },
-    {
-      "pun_id": 65,
-      "pun_label": "1300 min",
-      "pun_duration": 1300
-    },
-    {
-      "pun_id": 66,
-      "pun_label": "1320 min",
-      "pun_duration": 1320
-    },
-    {
-      "pun_id": 67,
-      "pun_label": "1340 min",
-      "pun_duration": 1340
-    },
-    {
-      "pun_id": 68,
-      "pun_label": "1360 min",
-      "pun_duration": 1360
-    },
-    {
-      "pun_id": 69,
-      "pun_label": "1380 min",
-      "pun_duration": 1380
-    },
-    {
-      "pun_id": 70,
-      "pun_label": "1400 min",
-      "pun_duration": 1400
-    },
-    {
-      "pun_id": 71,
-      "pun_label": "1420 min",
-      "pun_duration": 1420
-    },
-    {
-      "pun_id": 72,
-      "pun_label": "1440 min",
-      "pun_duration": 1440
-    },
-    {
-      "pun_id": 73,
-      "pun_label": "1440 min",
-      "pun_duration": 1440
-    },
-    {
-      "pun_id": 74,
-      "pun_label": "4320 min",
+      "pun_label": "72h",
       "pun_duration": 4320
     },
     {
-      "pun_id": 75,
-      "pun_label": "10080 min",
+      "pun_id": 16,
+      "pun_label": "168h",
       "pun_duration": 10080
     }
   ],