diff --git a/apiMockData/tdr-reference-curves/slot1.json b/apiMockData/tdr-reference-curves/slot1.json
index bcb5c32..9bdcefd 100644
--- a/apiMockData/tdr-reference-curves/slot1.json
+++ b/apiMockData/tdr-reference-curves/slot1.json
@@ -17,7 +17,7 @@
   },
   {
     "d": 56,
-    "p": 62
+    "p": 63
   },
   {
     "d": 69,
@@ -25,7 +25,7 @@
   },
   {
     "d": 83,
-    "p": 96
+    "p": 97
   },
   {
     "d": 97,
@@ -61,7 +61,7 @@
   },
   {
     "d": 208,
-    "p": -2
+    "p": -3
   },
   {
     "d": 222,
@@ -81,99 +81,99 @@
   },
   {
     "d": 278,
-    "p": -38
+    "p": -1
   },
   {
     "d": 292,
-    "p": -64
+    "p": -1
   },
   {
     "d": 306,
-    "p": -49
+    "p": -1
   },
   {
     "d": 319,
-    "p": -25
+    "p": -1
   },
   {
     "d": 333,
-    "p": -6
+    "p": -1
   },
   {
     "d": 347,
-    "p": 6
+    "p": -1
   },
   {
     "d": 361,
-    "p": 10
+    "p": -1
   },
   {
     "d": 375,
-    "p": 10
+    "p": -1
   },
   {
     "d": 389,
-    "p": 8
+    "p": -1
   },
   {
     "d": 403,
-    "p": 5
+    "p": -1
   },
   {
     "d": 417,
-    "p": 4
+    "p": -1
   },
   {
     "d": 431,
-    "p": 2
+    "p": -1
   },
   {
     "d": 444,
-    "p": 2
+    "p": -1
   },
   {
     "d": 458,
-    "p": 0
+    "p": -1
   },
   {
     "d": 472,
-    "p": 0
+    "p": -1
   },
   {
     "d": 486,
-    "p": 0
+    "p": -1
   },
   {
     "d": 500,
-    "p": 0
+    "p": -1
   },
   {
     "d": 514,
-    "p": 0
+    "p": -1
   },
   {
     "d": 528,
-    "p": 0
+    "p": -1
   },
   {
     "d": 542,
-    "p": 0
+    "p": -1
   },
   {
     "d": 556,
-    "p": 0
+    "p": -1
   },
   {
     "d": 569,
-    "p": 0
+    "p": -1
   },
   {
     "d": 583,
-    "p": 0
+    "p": -1
   },
   {
     "d": 597,
-    "p": 0
+    "p": -1
   },
   {
     "d": 611,
@@ -337,7 +337,7 @@
   },
   {
     "d": 1167,
-    "p": 0
+    "p": -1
   },
   {
     "d": 1181,
@@ -753,99 +753,99 @@
   },
   {
     "d": 2611,
-    "p": -1
+    "p": -6
   },
   {
     "d": 2625,
-    "p": -1
+    "p": -46
   },
   {
     "d": 2639,
-    "p": -1
+    "p": -63
   },
   {
     "d": 2653,
-    "p": -1
+    "p": -45
   },
   {
     "d": 2667,
-    "p": -1
+    "p": -21
   },
   {
     "d": 2681,
-    "p": -1
+    "p": -3
   },
   {
     "d": 2695,
-    "p": -1
+    "p": 7
   },
   {
     "d": 2709,
-    "p": -1
+    "p": 10
   },
   {
     "d": 2722,
-    "p": -1
+    "p": 9
   },
   {
     "d": 2736,
-    "p": -1
+    "p": 7
   },
   {
     "d": 2750,
-    "p": -1
+    "p": 5
   },
   {
     "d": 2764,
-    "p": -1
+    "p": 4
   },
   {
     "d": 2778,
-    "p": -1
+    "p": 2
   },
   {
     "d": 2792,
-    "p": -1
+    "p": 2
   },
   {
     "d": 2806,
-    "p": -1
+    "p": 1
   },
   {
     "d": 2820,
-    "p": -1
+    "p": 0
   },
   {
     "d": 2834,
-    "p": -1
+    "p": 0
   },
   {
     "d": 2847,
-    "p": -1
+    "p": 0
   },
   {
     "d": 2861,
-    "p": -1
+    "p": 0
   },
   {
     "d": 2875,
-    "p": -1
+    "p": 0
   },
   {
     "d": 2889,
-    "p": -1
+    "p": 0
   },
   {
     "d": 2903,
-    "p": -1
+    "p": 0
   },
   {
     "d": 2917,
-    "p": -1
+    "p": 0
   },
   {
     "d": 2931,
-    "p": -1
+    "p": 0
   },
   {
     "d": 2945,
@@ -853,7 +853,7 @@
   },
   {
     "d": 2959,
-    "p": -1
+    "p": 0
   },
   {
     "d": 2972,
@@ -921,7 +921,7 @@
   },
   {
     "d": 3195,
-    "p": -1
+    "p": 0
   },
   {
     "d": 3209,
@@ -1165,7 +1165,7 @@
   },
   {
     "d": 4042,
-    "p": -1
+    "p": 0
   },
   {
     "d": 4056,
@@ -1321,7 +1321,7 @@
   },
   {
     "d": 4584,
-    "p": 0
+    "p": -1
   },
   {
     "d": 4598,
@@ -1565,7 +1565,7 @@
   },
   {
     "d": 5431,
-    "p": 0
+    "p": -1
   },
   {
     "d": 5445,
@@ -2149,7 +2149,7 @@
   },
   {
     "d": 7459,
-    "p": -1
+    "p": 0
   },
   {
     "d": 7473,
@@ -2393,7 +2393,7 @@
   },
   {
     "d": 8306,
-    "p": -1
+    "p": 0
   },
   {
     "d": 8320,
@@ -2549,7 +2549,7 @@
   },
   {
     "d": 8848,
-    "p": 0
+    "p": -1
   },
   {
     "d": 8862,
@@ -2581,155 +2581,155 @@
   },
   {
     "d": 8959,
-    "p": 13
+    "p": -1
   },
   {
     "d": 8973,
-    "p": 50
+    "p": -1
   },
   {
     "d": 8987,
-    "p": 88
+    "p": -1
   },
   {
     "d": 9001,
-    "p": 117
+    "p": -1
   },
   {
     "d": 9015,
-    "p": 120
+    "p": -1
   },
   {
     "d": 9028,
-    "p": 93
+    "p": -1
   },
   {
     "d": 9042,
-    "p": 66
+    "p": -1
   },
   {
     "d": 9056,
-    "p": 54
+    "p": -1
   },
   {
     "d": 9070,
-    "p": 50
+    "p": -1
   },
   {
     "d": 9084,
-    "p": 48
+    "p": -1
   },
   {
     "d": 9098,
-    "p": 47
+    "p": -1
   },
   {
     "d": 9112,
-    "p": 45
+    "p": -1
   },
   {
     "d": 9126,
-    "p": 41
+    "p": -1
   },
   {
     "d": 9140,
-    "p": 37
+    "p": -1
   },
   {
     "d": 9154,
-    "p": 32
+    "p": -1
   },
   {
     "d": 9167,
-    "p": 28
+    "p": -1
   },
   {
     "d": 9181,
-    "p": 24
+    "p": -1
   },
   {
     "d": 9195,
-    "p": 20
+    "p": -1
   },
   {
     "d": 9209,
-    "p": 17
+    "p": -1
   },
   {
     "d": 9223,
-    "p": 15
+    "p": -1
   },
   {
     "d": 9237,
-    "p": 12
+    "p": -1
   },
   {
     "d": 9251,
-    "p": 10
+    "p": -1
   },
   {
     "d": 9265,
-    "p": 9
+    "p": -1
   },
   {
     "d": 9279,
-    "p": 7
+    "p": -1
   },
   {
     "d": 9292,
-    "p": 6
+    "p": -1
   },
   {
     "d": 9306,
-    "p": 5
+    "p": -1
   },
   {
     "d": 9320,
-    "p": 4
+    "p": -1
   },
   {
     "d": 9334,
-    "p": 3
+    "p": -1
   },
   {
     "d": 9348,
-    "p": 2
+    "p": -1
   },
   {
     "d": 9362,
-    "p": 2
+    "p": -1
   },
   {
     "d": 9376,
-    "p": 1
+    "p": -1
   },
   {
     "d": 9390,
-    "p": 0
+    "p": -1
   },
   {
     "d": 9404,
-    "p": 0
+    "p": -1
   },
   {
     "d": 9417,
-    "p": 0
+    "p": -1
   },
   {
     "d": 9431,
-    "p": 0
+    "p": -1
   },
   {
     "d": 9445,
-    "p": 0
+    "p": -1
   },
   {
     "d": 9459,
-    "p": 0
+    "p": -1
   },
   {
     "d": 9473,
-    "p": 0
+    "p": -1
   },
   {
     "d": 9487,
@@ -2769,27 +2769,27 @@
   },
   {
     "d": 9612,
-    "p": -2
+    "p": -1
   },
   {
     "d": 9626,
-    "p": -2
+    "p": -1
   },
   {
     "d": 9640,
-    "p": -2
+    "p": -1
   },
   {
     "d": 9654,
-    "p": -2
+    "p": -1
   },
   {
     "d": 9667,
-    "p": -2
+    "p": -1
   },
   {
     "d": 9681,
-    "p": -2
+    "p": -1
   },
   {
     "d": 9695,
@@ -2797,27 +2797,27 @@
   },
   {
     "d": 9709,
-    "p": -2
+    "p": -1
   },
   {
     "d": 9723,
-    "p": -2
+    "p": -1
   },
   {
     "d": 9737,
-    "p": -2
+    "p": -1
   },
   {
     "d": 9751,
-    "p": -2
+    "p": -1
   },
   {
     "d": 9765,
-    "p": -2
+    "p": -1
   },
   {
     "d": 9779,
-    "p": -2
+    "p": -1
   },
   {
     "d": 9792,
@@ -2825,135 +2825,135 @@
   },
   {
     "d": 9806,
-    "p": -2
+    "p": -1
   },
   {
     "d": 9820,
-    "p": -2
+    "p": -1
   },
   {
     "d": 9834,
-    "p": -2
+    "p": -1
   },
   {
     "d": 9848,
-    "p": -2
+    "p": -1
   },
   {
     "d": 9862,
-    "p": -2
+    "p": -1
   },
   {
     "d": 9876,
-    "p": -2
+    "p": -1
   },
   {
     "d": 9890,
-    "p": -2
+    "p": -1
   },
   {
     "d": 9904,
-    "p": -2
+    "p": -1
   },
   {
     "d": 9917,
-    "p": -2
+    "p": -1
   },
   {
     "d": 9931,
-    "p": -2
+    "p": -1
   },
   {
     "d": 9945,
-    "p": -2
+    "p": -1
   },
   {
     "d": 9959,
-    "p": -2
+    "p": -1
   },
   {
     "d": 9973,
-    "p": -2
+    "p": -1
   },
   {
     "d": 9987,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10001,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10015,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10029,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10042,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10056,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10070,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10084,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10098,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10112,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10126,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10140,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10154,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10167,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10181,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10195,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10209,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10223,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10237,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10251,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10265,
@@ -2961,271 +2961,271 @@
   },
   {
     "d": 10279,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10292,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10306,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10320,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10334,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10348,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10362,
-    "p": -2
+    "p": 6
   },
   {
     "d": 10376,
-    "p": -2
+    "p": 38
   },
   {
     "d": 10390,
-    "p": -2
+    "p": 77
   },
   {
     "d": 10404,
-    "p": -2
+    "p": 110
   },
   {
     "d": 10418,
-    "p": -2
+    "p": 121
   },
   {
     "d": 10431,
-    "p": -2
+    "p": 103
   },
   {
     "d": 10445,
-    "p": -2
+    "p": 72
   },
   {
     "d": 10459,
-    "p": -2
+    "p": 56
   },
   {
     "d": 10473,
-    "p": -2
+    "p": 50
   },
   {
     "d": 10487,
-    "p": -2
+    "p": 47
   },
   {
     "d": 10501,
-    "p": -2
+    "p": 46
   },
   {
     "d": 10515,
-    "p": -2
+    "p": 44
   },
   {
     "d": 10529,
-    "p": -2
+    "p": 41
   },
   {
     "d": 10543,
-    "p": -2
+    "p": 37
   },
   {
     "d": 10556,
-    "p": -2
+    "p": 33
   },
   {
     "d": 10570,
-    "p": -2
+    "p": 29
   },
   {
     "d": 10584,
-    "p": -2
+    "p": 25
   },
   {
     "d": 10598,
-    "p": -2
+    "p": 21
   },
   {
     "d": 10612,
-    "p": -2
+    "p": 18
   },
   {
     "d": 10626,
-    "p": -2
+    "p": 16
   },
   {
     "d": 10640,
-    "p": -2
+    "p": 13
   },
   {
     "d": 10654,
-    "p": -2
+    "p": 11
   },
   {
     "d": 10668,
-    "p": -1
+    "p": 9
   },
   {
     "d": 10681,
-    "p": -2
+    "p": 8
   },
   {
     "d": 10695,
-    "p": -2
+    "p": 6
   },
   {
     "d": 10709,
-    "p": -2
+    "p": 5
   },
   {
     "d": 10723,
-    "p": -2
+    "p": 4
   },
   {
     "d": 10737,
-    "p": -1
+    "p": 3
   },
   {
     "d": 10751,
-    "p": -2
+    "p": 2
   },
   {
     "d": 10765,
-    "p": -2
+    "p": 2
   },
   {
     "d": 10779,
-    "p": -2
+    "p": 2
   },
   {
     "d": 10793,
-    "p": -2
+    "p": 1
   },
   {
     "d": 10806,
-    "p": -2
+    "p": 0
   },
   {
     "d": 10820,
-    "p": -2
+    "p": 0
   },
   {
     "d": 10834,
-    "p": -2
+    "p": 0
   },
   {
     "d": 10848,
-    "p": -2
+    "p": 0
   },
   {
     "d": 10862,
-    "p": -1
+    "p": 0
   },
   {
     "d": 10876,
-    "p": -2
+    "p": 0
   },
   {
     "d": 10890,
-    "p": -2
+    "p": 0
   },
   {
     "d": 10904,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10918,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10931,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10945,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10959,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10973,
-    "p": -2
+    "p": -1
   },
   {
     "d": 10987,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11001,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11015,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11029,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11043,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11056,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11070,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11084,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11098,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11112,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11126,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11140,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11154,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11168,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11181,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11195,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11209,
@@ -3241,19 +3241,19 @@
   },
   {
     "d": 11251,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11265,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11279,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11293,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11306,
@@ -3269,43 +3269,43 @@
   },
   {
     "d": 11348,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11362,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11376,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11390,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11404,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11418,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11431,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11445,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11459,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11473,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11487,
@@ -3361,15 +3361,15 @@
   },
   {
     "d": 11668,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11681,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11695,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11709,
@@ -3385,7 +3385,7 @@
   },
   {
     "d": 11751,
-    "p": -1
+    "p": -2
   },
   {
     "d": 11765,
@@ -3413,15 +3413,15 @@
   },
   {
     "d": 11848,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11862,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11876,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11890,
@@ -3441,7 +3441,7 @@
   },
   {
     "d": 11945,
-    "p": -2
+    "p": -1
   },
   {
     "d": 11959,
@@ -3477,7 +3477,7 @@
   },
   {
     "d": 12070,
-    "p": -2
+    "p": -1
   },
   {
     "d": 12084,
@@ -3501,15 +3501,15 @@
   },
   {
     "d": 12154,
-    "p": -2
+    "p": -1
   },
   {
     "d": 12168,
-    "p": -2
+    "p": -1
   },
   {
     "d": 12182,
-    "p": -2
+    "p": -1
   },
   {
     "d": 12195,
@@ -3549,7 +3549,7 @@
   },
   {
     "d": 12320,
-    "p": -1
+    "p": -2
   },
   {
     "d": 12334,
@@ -3573,11 +3573,11 @@
   },
   {
     "d": 12404,
-    "p": -1
+    "p": -2
   },
   {
     "d": 12418,
-    "p": -1
+    "p": -2
   },
   {
     "d": 12432,
@@ -3593,7 +3593,7 @@
   },
   {
     "d": 12473,
-    "p": -2
+    "p": -1
   },
   {
     "d": 12487,
@@ -3621,7 +3621,7 @@
   },
   {
     "d": 12570,
-    "p": -2
+    "p": -1
   },
   {
     "d": 12584,
@@ -3641,7 +3641,7 @@
   },
   {
     "d": 12640,
-    "p": -2
+    "p": -1
   },
   {
     "d": 12654,
@@ -3669,7 +3669,7 @@
   },
   {
     "d": 12737,
-    "p": -2
+    "p": -1
   },
   {
     "d": 12751,
@@ -3693,11 +3693,11 @@
   },
   {
     "d": 12820,
-    "p": -2
+    "p": -1
   },
   {
     "d": 12834,
-    "p": -2
+    "p": -1
   },
   {
     "d": 12848,
@@ -3709,11 +3709,11 @@
   },
   {
     "d": 12876,
-    "p": -2
+    "p": -1
   },
   {
     "d": 12890,
-    "p": -2
+    "p": -1
   },
   {
     "d": 12904,
@@ -3733,7 +3733,7 @@
   },
   {
     "d": 12959,
-    "p": -2
+    "p": -1
   },
   {
     "d": 12973,
@@ -3745,7 +3745,7 @@
   },
   {
     "d": 13001,
-    "p": -2
+    "p": -1
   },
   {
     "d": 13015,
@@ -3805,7 +3805,7 @@
   },
   {
     "d": 13209,
-    "p": -1
+    "p": -2
   },
   {
     "d": 13223,
@@ -3825,11 +3825,11 @@
   },
   {
     "d": 13279,
-    "p": -2
+    "p": -1
   },
   {
     "d": 13293,
-    "p": -2
+    "p": -1
   },
   {
     "d": 13307,
@@ -3837,15 +3837,15 @@
   },
   {
     "d": 13321,
-    "p": -2
+    "p": -1
   },
   {
     "d": 13334,
-    "p": -2
+    "p": -1
   },
   {
     "d": 13348,
-    "p": -2
+    "p": -1
   },
   {
     "d": 13362,
@@ -3869,7 +3869,7 @@
   },
   {
     "d": 13432,
-    "p": -1
+    "p": -2
   },
   {
     "d": 13446,
@@ -3901,19 +3901,19 @@
   },
   {
     "d": 13543,
-    "p": -2
+    "p": -1
   },
   {
     "d": 13557,
-    "p": -2
+    "p": -1
   },
   {
     "d": 13571,
-    "p": -2
+    "p": -1
   },
   {
     "d": 13584,
-    "p": -2
+    "p": -1
   },
   {
     "d": 13598,
@@ -3921,7 +3921,7 @@
   },
   {
     "d": 13612,
-    "p": -2
+    "p": -1
   },
   {
     "d": 13626,
@@ -4001,11 +4001,11 @@
   },
   {
     "d": 13890,
-    "p": -1
+    "p": -2
   },
   {
     "d": 13904,
-    "p": -1
+    "p": -2
   },
   {
     "d": 13918,
@@ -4021,7 +4021,7 @@
   },
   {
     "d": 13959,
-    "p": -1
+    "p": -2
   },
   {
     "d": 13973,
@@ -4037,7 +4037,7 @@
   },
   {
     "d": 14015,
-    "p": -2
+    "p": -1
   },
   {
     "d": 14029,
@@ -4137,15 +4137,15 @@
   },
   {
     "d": 14362,
-    "p": -1
+    "p": -2
   },
   {
     "d": 14376,
-    "p": -1
+    "p": -2
   },
   {
     "d": 14390,
-    "p": -2
+    "p": -1
   },
   {
     "d": 14404,
@@ -4229,7 +4229,7 @@
   },
   {
     "d": 14682,
-    "p": -2
+    "p": -1
   },
   {
     "d": 14696,
@@ -4257,11 +4257,11 @@
   },
   {
     "d": 14779,
-    "p": -2
+    "p": -1
   },
   {
     "d": 14793,
-    "p": -2
+    "p": -1
   },
   {
     "d": 14807,
@@ -4317,27 +4317,27 @@
   },
   {
     "d": 14987,
-    "p": -2
+    "p": -1
   },
   {
     "d": 15001,
-    "p": -2
+    "p": -1
   },
   {
     "d": 15015,
-    "p": -2
+    "p": -1
   },
   {
     "d": 15029,
-    "p": -2
+    "p": -1
   },
   {
     "d": 15043,
-    "p": -1
+    "p": -2
   },
   {
     "d": 15057,
-    "p": -1
+    "p": -2
   },
   {
     "d": 15071,
@@ -4397,7 +4397,7 @@
   },
   {
     "d": 15265,
-    "p": -2
+    "p": -1
   },
   {
     "d": 15279,
@@ -4409,7 +4409,7 @@
   },
   {
     "d": 15307,
-    "p": -1
+    "p": -2
   },
   {
     "d": 15321,
@@ -4445,11 +4445,11 @@
   },
   {
     "d": 15432,
-    "p": -2
+    "p": -1
   },
   {
     "d": 15446,
-    "p": -2
+    "p": -1
   },
   {
     "d": 15460,
@@ -4525,11 +4525,11 @@
   },
   {
     "d": 15710,
-    "p": -2
+    "p": -1
   },
   {
     "d": 15723,
-    "p": -1
+    "p": -2
   },
   {
     "d": 15737,
@@ -4545,11 +4545,11 @@
   },
   {
     "d": 15779,
-    "p": -2
+    "p": -1
   },
   {
     "d": 15793,
-    "p": -2
+    "p": -1
   },
   {
     "d": 15807,
@@ -4561,11 +4561,11 @@
   },
   {
     "d": 15835,
-    "p": -1
+    "p": -2
   },
   {
     "d": 15848,
-    "p": -1
+    "p": -2
   },
   {
     "d": 15862,
@@ -4613,7 +4613,7 @@
   },
   {
     "d": 16015,
-    "p": -1
+    "p": -2
   },
   {
     "d": 16029,
@@ -4621,15 +4621,15 @@
   },
   {
     "d": 16043,
-    "p": -1
+    "p": -2
   },
   {
     "d": 16057,
-    "p": -1
+    "p": -2
   },
   {
     "d": 16071,
-    "p": -1
+    "p": -2
   },
   {
     "d": 16085,
@@ -4645,11 +4645,11 @@
   },
   {
     "d": 16126,
-    "p": -1
+    "p": -2
   },
   {
     "d": 16140,
-    "p": -2
+    "p": -1
   },
   {
     "d": 16154,
@@ -4681,11 +4681,11 @@
   },
   {
     "d": 16251,
-    "p": -2
+    "p": -1
   },
   {
     "d": 16265,
-    "p": -2
+    "p": -1
   },
   {
     "d": 16279,
@@ -4709,11 +4709,11 @@
   },
   {
     "d": 16349,
-    "p": -1
+    "p": -2
   },
   {
     "d": 16362,
-    "p": -2
+    "p": -1
   },
   {
     "d": 16376,
@@ -4741,15 +4741,15 @@
   },
   {
     "d": 16460,
-    "p": -2
+    "p": -1
   },
   {
     "d": 16474,
-    "p": -2
+    "p": -1
   },
   {
     "d": 16487,
-    "p": -2
+    "p": -1
   },
   {
     "d": 16501,
@@ -4757,19 +4757,19 @@
   },
   {
     "d": 16515,
-    "p": -2
-  },
-  {
-    "d": 16529,
     "p": -1
   },
   {
-    "d": 16543,
+    "d": 16529,
     "p": -2
   },
+  {
+    "d": 16543,
+    "p": -1
+  },
   {
     "d": 16557,
-    "p": -2
+    "p": -1
   },
   {
     "d": 16571,
@@ -4777,7 +4777,7 @@
   },
   {
     "d": 16585,
-    "p": -2
+    "p": -1
   },
   {
     "d": 16599,
@@ -4793,7 +4793,7 @@
   },
   {
     "d": 16640,
-    "p": -1
+    "p": -2
   },
   {
     "d": 16654,
@@ -4801,7 +4801,7 @@
   },
   {
     "d": 16668,
-    "p": -2
+    "p": -1
   },
   {
     "d": 16682,
@@ -4813,15 +4813,15 @@
   },
   {
     "d": 16710,
-    "p": -1
+    "p": -2
   },
   {
     "d": 16724,
-    "p": -1
+    "p": -2
   },
   {
     "d": 16737,
-    "p": -2
+    "p": -1
   },
   {
     "d": 16751,
@@ -4841,15 +4841,15 @@
   },
   {
     "d": 16807,
-    "p": -1
+    "p": -2
   },
   {
     "d": 16821,
-    "p": -1
+    "p": -2
   },
   {
     "d": 16835,
-    "p": -2
+    "p": -1
   },
   {
     "d": 16849,
@@ -4869,24 +4869,24 @@
   },
   {
     "d": 16904,
-    "p": -2
-  },
-  {
-    "d": 16918,
-    "p": -2
-  },
-  {
-    "d": 16932,
-    "p": -2
-  },
-  {
-    "d": 16946,
     "p": -1
   },
   {
-    "d": 16960,
+    "d": 16918,
+    "p": -1
+  },
+  {
+    "d": 16932,
+    "p": -1
+  },
+  {
+    "d": 16946,
     "p": -2
   },
+  {
+    "d": 16960,
+    "p": -1
+  },
   {
     "d": 16974,
     "p": -2
@@ -4901,15 +4901,15 @@
   },
   {
     "d": 17015,
-    "p": -2
+    "p": -1
   },
   {
     "d": 17029,
-    "p": -2
+    "p": -1
   },
   {
     "d": 17043,
-    "p": -1
+    "p": -2
   },
   {
     "d": 17057,
@@ -4933,7 +4933,7 @@
   },
   {
     "d": 17126,
-    "p": -1
+    "p": -2
   },
   {
     "d": 17140,
@@ -4949,7 +4949,7 @@
   },
   {
     "d": 17182,
-    "p": -1
+    "p": -2
   },
   {
     "d": 17196,
@@ -4957,27 +4957,27 @@
   },
   {
     "d": 17210,
-    "p": -2
+    "p": -1
   },
   {
     "d": 17224,
-    "p": -2
+    "p": -1
   },
   {
     "d": 17237,
-    "p": -2
+    "p": -1
   },
   {
     "d": 17251,
-    "p": -2
+    "p": -1
   },
   {
     "d": 17265,
-    "p": -1
+    "p": -2
   },
   {
     "d": 17279,
-    "p": -1
+    "p": -2
   },
   {
     "d": 17293,
@@ -4985,7 +4985,7 @@
   },
   {
     "d": 17307,
-    "p": -1
+    "p": -2
   },
   {
     "d": 17321,
@@ -5025,7 +5025,7 @@
   },
   {
     "d": 17446,
-    "p": -1
+    "p": -2
   },
   {
     "d": 17460,
@@ -5037,19 +5037,19 @@
   },
   {
     "d": 17488,
-    "p": -1
+    "p": -2
   },
   {
     "d": 17501,
-    "p": -1
+    "p": -2
   },
   {
     "d": 17515,
-    "p": -1
+    "p": -2
   },
   {
     "d": 17529,
-    "p": -1
+    "p": -2
   },
   {
     "d": 17543,
@@ -5057,7 +5057,7 @@
   },
   {
     "d": 17557,
-    "p": -1
+    "p": -2
   },
   {
     "d": 17571,
@@ -5065,20 +5065,20 @@
   },
   {
     "d": 17585,
-    "p": -1
-  },
-  {
-    "d": 17599,
-    "p": -1
-  },
-  {
-    "d": 17613,
     "p": -2
   },
   {
-    "d": 17626,
+    "d": 17599,
+    "p": -2
+  },
+  {
+    "d": 17613,
     "p": -1
   },
+  {
+    "d": 17626,
+    "p": -2
+  },
   {
     "d": 17640,
     "p": -2
@@ -5113,7 +5113,7 @@
   },
   {
     "d": 17751,
-    "p": -1
+    "p": -2
   },
   {
     "d": 17765,
@@ -5125,11 +5125,11 @@
   },
   {
     "d": 17793,
-    "p": -2
+    "p": -1
   },
   {
     "d": 17807,
-    "p": -1
+    "p": -2
   },
   {
     "d": 17821,
@@ -5145,7 +5145,7 @@
   },
   {
     "d": 17863,
-    "p": -1
+    "p": -2
   },
   {
     "d": 17876,
@@ -5165,35 +5165,35 @@
   },
   {
     "d": 17932,
-    "p": -1
+    "p": -2
   },
   {
     "d": 17946,
-    "p": -2
+    "p": -1
   },
   {
     "d": 17960,
-    "p": -2
+    "p": -1
   },
   {
     "d": 17974,
-    "p": -2
+    "p": -1
   },
   {
     "d": 17988,
-    "p": -1
+    "p": -2
   },
   {
     "d": 18001,
-    "p": -1
+    "p": -2
   },
   {
     "d": 18015,
-    "p": -2
+    "p": -1
   },
   {
     "d": 18029,
-    "p": -2
+    "p": -1
   },
   {
     "d": 18043,
@@ -5209,23 +5209,23 @@
   },
   {
     "d": 18085,
-    "p": -1
+    "p": -2
   },
   {
     "d": 18099,
-    "p": -1
+    "p": -2
   },
   {
     "d": 18113,
-    "p": -2
+    "p": -1
   },
   {
     "d": 18126,
-    "p": -2
+    "p": -1
   },
   {
     "d": 18140,
-    "p": -2
+    "p": -1
   },
   {
     "d": 18154,
@@ -5245,7 +5245,7 @@
   },
   {
     "d": 18210,
-    "p": -1
+    "p": -2
   },
   {
     "d": 18224,
@@ -5253,7 +5253,7 @@
   },
   {
     "d": 18238,
-    "p": -2
+    "p": -1
   },
   {
     "d": 18251,
@@ -5261,7 +5261,7 @@
   },
   {
     "d": 18265,
-    "p": -1
+    "p": -2
   },
   {
     "d": 18279,
@@ -5289,7 +5289,7 @@
   },
   {
     "d": 18363,
-    "p": -2
+    "p": -1
   },
   {
     "d": 18376,
@@ -5301,7 +5301,7 @@
   },
   {
     "d": 18404,
-    "p": -2
+    "p": -1
   },
   {
     "d": 18418,
@@ -5321,11 +5321,11 @@
   },
   {
     "d": 18474,
-    "p": -1
+    "p": -2
   },
   {
     "d": 18488,
-    "p": -1
+    "p": -2
   },
   {
     "d": 18501,
@@ -5365,7 +5365,7 @@
   },
   {
     "d": 18626,
-    "p": -2
+    "p": -1
   },
   {
     "d": 18640,
@@ -5389,7 +5389,7 @@
   },
   {
     "d": 18710,
-    "p": -1
+    "p": -2
   },
   {
     "d": 18724,
@@ -5401,7 +5401,7 @@
   },
   {
     "d": 18752,
-    "p": -1
+    "p": -2
   },
   {
     "d": 18765,
@@ -5409,11 +5409,11 @@
   },
   {
     "d": 18779,
-    "p": -1
+    "p": -2
   },
   {
     "d": 18793,
-    "p": -1
+    "p": -2
   },
   {
     "d": 18807,
@@ -5433,11 +5433,11 @@
   },
   {
     "d": 18863,
-    "p": -1
+    "p": -2
   },
   {
     "d": 18877,
-    "p": -1
+    "p": -2
   },
   {
     "d": 18890,
@@ -5453,11 +5453,11 @@
   },
   {
     "d": 18932,
-    "p": -1
+    "p": -2
   },
   {
     "d": 18946,
-    "p": -1
+    "p": -2
   },
   {
     "d": 18960,
@@ -5473,7 +5473,7 @@
   },
   {
     "d": 19002,
-    "p": -2
+    "p": -1
   },
   {
     "d": 19015,
@@ -5485,7 +5485,7 @@
   },
   {
     "d": 19043,
-    "p": -1
+    "p": -2
   },
   {
     "d": 19057,
@@ -5493,27 +5493,27 @@
   },
   {
     "d": 19071,
-    "p": -2
+    "p": -1
   },
   {
     "d": 19085,
-    "p": -2
+    "p": -1
   },
   {
     "d": 19099,
-    "p": -2
+    "p": -1
   },
   {
     "d": 19113,
-    "p": -2
+    "p": -1
   },
   {
     "d": 19127,
-    "p": -2
+    "p": -1
   },
   {
     "d": 19140,
-    "p": -1
+    "p": -2
   },
   {
     "d": 19154,
@@ -5521,15 +5521,15 @@
   },
   {
     "d": 19168,
-    "p": -2
+    "p": -1
   },
   {
     "d": 19182,
-    "p": -2
+    "p": -1
   },
   {
     "d": 19196,
-    "p": -2
+    "p": -1
   },
   {
     "d": 19210,
@@ -5541,7 +5541,7 @@
   },
   {
     "d": 19238,
-    "p": -2
+    "p": -1
   },
   {
     "d": 19252,
@@ -5549,7 +5549,7 @@
   },
   {
     "d": 19265,
-    "p": -1
+    "p": -2
   },
   {
     "d": 19279,
@@ -5577,7 +5577,7 @@
   },
   {
     "d": 19363,
-    "p": -2
+    "p": -1
   },
   {
     "d": 19377,
@@ -5585,7 +5585,7 @@
   },
   {
     "d": 19390,
-    "p": -2
+    "p": -1
   },
   {
     "d": 19404,
@@ -5593,15 +5593,15 @@
   },
   {
     "d": 19418,
-    "p": -1
+    "p": -2
   },
   {
     "d": 19432,
-    "p": -1
+    "p": -2
   },
   {
     "d": 19446,
-    "p": -2
+    "p": -1
   },
   {
     "d": 19460,
@@ -5613,7 +5613,7 @@
   },
   {
     "d": 19488,
-    "p": -1
+    "p": -2
   },
   {
     "d": 19502,
@@ -5633,7 +5633,7 @@
   },
   {
     "d": 19557,
-    "p": -1
+    "p": -2
   },
   {
     "d": 19571,
@@ -5657,11 +5657,11 @@
   },
   {
     "d": 19640,
-    "p": -1
+    "p": -2
   },
   {
     "d": 19654,
-    "p": -1
+    "p": -2
   },
   {
     "d": 19668,
@@ -5673,19 +5673,19 @@
   },
   {
     "d": 19696,
-    "p": -1
+    "p": -2
   },
   {
     "d": 19710,
-    "p": -1
+    "p": -2
   },
   {
     "d": 19724,
-    "p": -1
+    "p": -2
   },
   {
     "d": 19738,
-    "p": -1
+    "p": -2
   },
   {
     "d": 19752,
@@ -5697,24 +5697,24 @@
   },
   {
     "d": 19779,
-    "p": -2
-  },
-  {
-    "d": 19793,
-    "p": -2
-  },
-  {
-    "d": 19807,
-    "p": -2
-  },
-  {
-    "d": 19821,
     "p": -1
   },
   {
-    "d": 19835,
+    "d": 19793,
+    "p": -1
+  },
+  {
+    "d": 19807,
+    "p": -1
+  },
+  {
+    "d": 19821,
     "p": -2
   },
+  {
+    "d": 19835,
+    "p": -1
+  },
   {
     "d": 19849,
     "p": -1
@@ -5729,19 +5729,19 @@
   },
   {
     "d": 19890,
-    "p": -1
+    "p": -2
   },
   {
     "d": 19904,
-    "p": -1
+    "p": -2
   },
   {
     "d": 19918,
-    "p": -1
+    "p": -2
   },
   {
     "d": 19932,
-    "p": -1
+    "p": -2
   },
   {
     "d": 19946,
@@ -5765,11 +5765,11 @@
   },
   {
     "d": 20015,
-    "p": -1
+    "p": -2
   },
   {
     "d": 20029,
-    "p": -1
+    "p": -2
   },
   {
     "d": 20043,
@@ -5785,15 +5785,15 @@
   },
   {
     "d": 20085,
-    "p": -2
+    "p": -1
   },
   {
     "d": 20099,
-    "p": -2
+    "p": -1
   },
   {
     "d": 20113,
-    "p": -2
+    "p": -1
   },
   {
     "d": 20127,
@@ -5805,11 +5805,11 @@
   },
   {
     "d": 20154,
-    "p": -1
+    "p": -2
   },
   {
     "d": 20168,
-    "p": -1
+    "p": -2
   },
   {
     "d": 20182,
@@ -5817,11 +5817,11 @@
   },
   {
     "d": 20196,
-    "p": -1
+    "p": -2
   },
   {
     "d": 20210,
-    "p": -2
+    "p": -1
   },
   {
     "d": 20224,
@@ -5833,11 +5833,11 @@
   },
   {
     "d": 20252,
-    "p": -1
+    "p": -2
   },
   {
     "d": 20266,
-    "p": -1
+    "p": -2
   },
   {
     "d": 20279,
@@ -5865,7 +5865,7 @@
   },
   {
     "d": 20363,
-    "p": -1
+    "p": -2
   },
   {
     "d": 20377,
@@ -5877,19 +5877,19 @@
   },
   {
     "d": 20404,
-    "p": -1
+    "p": -2
   },
   {
     "d": 20418,
-    "p": -1
+    "p": -2
   },
   {
     "d": 20432,
-    "p": -1
+    "p": -2
   },
   {
     "d": 20446,
-    "p": -1
+    "p": -2
   },
   {
     "d": 20460,
@@ -5897,7 +5897,7 @@
   },
   {
     "d": 20474,
-    "p": -2
+    "p": -1
   },
   {
     "d": 20488,
@@ -5913,7 +5913,7 @@
   },
   {
     "d": 20529,
-    "p": -1
+    "p": -2
   },
   {
     "d": 20543,
@@ -5925,15 +5925,15 @@
   },
   {
     "d": 20571,
-    "p": -2
+    "p": -1
   },
   {
     "d": 20585,
-    "p": -2
+    "p": -1
   },
   {
     "d": 20599,
-    "p": -1
+    "p": -2
   },
   {
     "d": 20613,
@@ -5941,15 +5941,15 @@
   },
   {
     "d": 20627,
-    "p": -1
+    "p": -2
   },
   {
     "d": 20641,
-    "p": -1
+    "p": -2
   },
   {
     "d": 20654,
-    "p": -2
+    "p": -1
   },
   {
     "d": 20668,
@@ -5961,11 +5961,11 @@
   },
   {
     "d": 20696,
-    "p": -1
+    "p": -2
   },
   {
     "d": 20710,
-    "p": -1
+    "p": -2
   },
   {
     "d": 20724,
@@ -5973,7 +5973,7 @@
   },
   {
     "d": 20738,
-    "p": -1
+    "p": -2
   },
   {
     "d": 20752,
@@ -5993,7 +5993,7 @@
   },
   {
     "d": 20807,
-    "p": -2
+    "p": -1
   },
   {
     "d": 20821,
@@ -6017,15 +6017,15 @@
   },
   {
     "d": 20891,
-    "p": -1
+    "p": -2
   },
   {
     "d": 20904,
-    "p": -1
+    "p": -2
   },
   {
     "d": 20918,
-    "p": -1
+    "p": -2
   },
   {
     "d": 20932,
@@ -6037,7 +6037,7 @@
   },
   {
     "d": 20960,
-    "p": -1
+    "p": -2
   },
   {
     "d": 20974,
@@ -6049,28 +6049,28 @@
   },
   {
     "d": 21002,
-    "p": -1
-  },
-  {
-    "d": 21016,
-    "p": -1
-  },
-  {
-    "d": 21029,
-    "p": -1
-  },
-  {
-    "d": 21043,
-    "p": -1
-  },
-  {
-    "d": 21057,
     "p": -2
   },
   {
-    "d": 21071,
+    "d": 21016,
+    "p": -2
+  },
+  {
+    "d": 21029,
+    "p": -2
+  },
+  {
+    "d": 21043,
+    "p": -2
+  },
+  {
+    "d": 21057,
     "p": -1
   },
+  {
+    "d": 21071,
+    "p": -2
+  },
   {
     "d": 21085,
     "p": -1
@@ -6081,19 +6081,19 @@
   },
   {
     "d": 21113,
-    "p": -1
+    "p": -2
   },
   {
     "d": 21127,
-    "p": -1
+    "p": -2
   },
   {
     "d": 21141,
-    "p": -1
+    "p": -2
   },
   {
     "d": 21154,
-    "p": -1
+    "p": -2
   },
   {
     "d": 21168,
@@ -6117,23 +6117,23 @@
   },
   {
     "d": 21238,
-    "p": -2
-  },
-  {
-    "d": 21252,
-    "p": -2
-  },
-  {
-    "d": 21266,
     "p": -1
   },
   {
-    "d": 21279,
+    "d": 21252,
+    "p": -1
+  },
+  {
+    "d": 21266,
     "p": -2
   },
+  {
+    "d": 21279,
+    "p": -1
+  },
   {
     "d": 21293,
-    "p": -2
+    "p": -1
   },
   {
     "d": 21307,
@@ -6157,7 +6157,7 @@
   },
   {
     "d": 21377,
-    "p": -1
+    "p": -2
   },
   {
     "d": 21391,
@@ -6173,7 +6173,7 @@
   },
   {
     "d": 21432,
-    "p": -2
+    "p": -1
   },
   {
     "d": 21446,
@@ -6185,7 +6185,7 @@
   },
   {
     "d": 21474,
-    "p": -1
+    "p": -2
   },
   {
     "d": 21488,
@@ -6217,11 +6217,11 @@
   },
   {
     "d": 21585,
-    "p": -2
+    "p": -1
   },
   {
     "d": 21599,
-    "p": -1
+    "p": -2
   },
   {
     "d": 21613,
@@ -6233,7 +6233,7 @@
   },
   {
     "d": 21641,
-    "p": -2
+    "p": -1
   },
   {
     "d": 21655,
@@ -6245,7 +6245,7 @@
   },
   {
     "d": 21682,
-    "p": -2
+    "p": -1
   },
   {
     "d": 21696,
@@ -6253,7 +6253,7 @@
   },
   {
     "d": 21710,
-    "p": -1
+    "p": -2
   },
   {
     "d": 21724,
@@ -6261,7 +6261,7 @@
   },
   {
     "d": 21738,
-    "p": -2
+    "p": -1
   },
   {
     "d": 21752,
@@ -6273,7 +6273,7 @@
   },
   {
     "d": 21780,
-    "p": -1
+    "p": -2
   },
   {
     "d": 21793,
@@ -6293,15 +6293,15 @@
   },
   {
     "d": 21849,
-    "p": -1
+    "p": -2
   },
   {
     "d": 21863,
-    "p": -1
+    "p": -2
   },
   {
     "d": 21877,
-    "p": -1
+    "p": -2
   },
   {
     "d": 21891,
@@ -6317,11 +6317,11 @@
   },
   {
     "d": 21932,
-    "p": -1
+    "p": -2
   },
   {
     "d": 21946,
-    "p": -1
+    "p": -2
   },
   {
     "d": 21960,
@@ -6329,7 +6329,7 @@
   },
   {
     "d": 21974,
-    "p": -1
+    "p": -2
   },
   {
     "d": 21988,
@@ -6353,7 +6353,7 @@
   },
   {
     "d": 22057,
-    "p": -2
+    "p": -1
   },
   {
     "d": 22071,
@@ -6361,7 +6361,7 @@
   },
   {
     "d": 22085,
-    "p": -1
+    "p": -2
   },
   {
     "d": 22099,
@@ -6377,11 +6377,11 @@
   },
   {
     "d": 22141,
-    "p": -1
+    "p": -2
   },
   {
     "d": 22155,
-    "p": -1
+    "p": -2
   },
   {
     "d": 22168,
@@ -6405,11 +6405,11 @@
   },
   {
     "d": 22238,
-    "p": -1
+    "p": -2
   },
   {
     "d": 22252,
-    "p": -1
+    "p": -2
   },
   {
     "d": 22266,
@@ -6441,11 +6441,11 @@
   },
   {
     "d": 22363,
-    "p": -1
+    "p": -2
   },
   {
     "d": 22377,
-    "p": -1
+    "p": -2
   },
   {
     "d": 22391,
@@ -6457,15 +6457,15 @@
   },
   {
     "d": 22418,
-    "p": -1
+    "p": -2
   },
   {
     "d": 22432,
-    "p": -1
+    "p": -2
   },
   {
     "d": 22446,
-    "p": -1
+    "p": -2
   },
   {
     "d": 22460,
@@ -6481,19 +6481,19 @@
   },
   {
     "d": 22502,
-    "p": -2
+    "p": -1
   },
   {
     "d": 22516,
-    "p": -2
+    "p": -1
   },
   {
     "d": 22530,
-    "p": -2
+    "p": -1
   },
   {
     "d": 22543,
-    "p": -1
+    "p": -2
   },
   {
     "d": 22557,
@@ -6529,7 +6529,7 @@
   },
   {
     "d": 22668,
-    "p": -1
+    "p": -2
   },
   {
     "d": 22682,
@@ -6545,7 +6545,7 @@
   },
   {
     "d": 22724,
-    "p": -2
+    "p": -1
   },
   {
     "d": 22738,
@@ -6565,7 +6565,7 @@
   },
   {
     "d": 22793,
-    "p": -2
+    "p": -1
   },
   {
     "d": 22807,
@@ -6573,19 +6573,19 @@
   },
   {
     "d": 22821,
-    "p": -1
+    "p": -2
   },
   {
     "d": 22835,
-    "p": -1
+    "p": -2
   },
   {
     "d": 22849,
-    "p": -1
+    "p": -2
   },
   {
     "d": 22863,
-    "p": -1
+    "p": -2
   },
   {
     "d": 22877,
@@ -6605,7 +6605,7 @@
   },
   {
     "d": 22932,
-    "p": -1
+    "p": -2
   },
   {
     "d": 22946,
@@ -6629,7 +6629,7 @@
   },
   {
     "d": 23016,
-    "p": -2
+    "p": -1
   },
   {
     "d": 23030,
@@ -6653,11 +6653,11 @@
   },
   {
     "d": 23099,
-    "p": -1
+    "p": -2
   },
   {
     "d": 23113,
-    "p": -1
+    "p": -2
   },
   {
     "d": 23127,
@@ -6677,23 +6677,23 @@
   },
   {
     "d": 23182,
-    "p": -1
-  },
-  {
-    "d": 23196,
-    "p": -1
-  },
-  {
-    "d": 23210,
     "p": -2
   },
   {
-    "d": 23224,
+    "d": 23196,
+    "p": -2
+  },
+  {
+    "d": 23210,
     "p": -1
   },
+  {
+    "d": 23224,
+    "p": -2
+  },
   {
     "d": 23238,
-    "p": -1
+    "p": -2
   },
   {
     "d": 23252,
@@ -6721,7 +6721,7 @@
   },
   {
     "d": 23335,
-    "p": -1
+    "p": -2
   },
   {
     "d": 23349,
@@ -6733,11 +6733,11 @@
   },
   {
     "d": 23377,
-    "p": -2
+    "p": -1
   },
   {
     "d": 23391,
-    "p": -2
+    "p": -1
   },
   {
     "d": 23405,
@@ -6777,7 +6777,7 @@
   },
   {
     "d": 23530,
-    "p": -1
+    "p": -2
   },
   {
     "d": 23544,
@@ -6821,15 +6821,15 @@
   },
   {
     "d": 23682,
-    "p": -1
+    "p": -2
   },
   {
     "d": 23696,
-    "p": -1
+    "p": -2
   },
   {
     "d": 23710,
-    "p": -1
+    "p": -2
   },
   {
     "d": 23724,
@@ -6861,7 +6861,7 @@
   },
   {
     "d": 23821,
-    "p": -1
+    "p": -2
   },
   {
     "d": 23835,
@@ -6873,11 +6873,11 @@
   },
   {
     "d": 23863,
-    "p": -1
+    "p": -2
   },
   {
     "d": 23877,
-    "p": -2
+    "p": -1
   },
   {
     "d": 23891,
@@ -6913,7 +6913,7 @@
   },
   {
     "d": 24002,
-    "p": -2
+    "p": -1
   },
   {
     "d": 24016,
@@ -6921,11 +6921,11 @@
   },
   {
     "d": 24030,
-    "p": -1
+    "p": -2
   },
   {
     "d": 24044,
-    "p": -1
+    "p": -2
   },
   {
     "d": 24057,
@@ -6961,11 +6961,11 @@
   },
   {
     "d": 24169,
-    "p": -2
+    "p": -1
   },
   {
     "d": 24182,
-    "p": -2
+    "p": -1
   },
   {
     "d": 24196,
@@ -6973,15 +6973,15 @@
   },
   {
     "d": 24210,
-    "p": -2
+    "p": -1
   },
   {
     "d": 24224,
-    "p": -2
+    "p": -1
   },
   {
     "d": 24238,
-    "p": -2
+    "p": -1
   },
   {
     "d": 24252,
@@ -7005,7 +7005,7 @@
   },
   {
     "d": 24321,
-    "p": -1
+    "p": -2
   },
   {
     "d": 24335,
@@ -7025,11 +7025,11 @@
   },
   {
     "d": 24391,
-    "p": -1
+    "p": -2
   },
   {
     "d": 24405,
-    "p": -1
+    "p": -2
   },
   {
     "d": 24419,
@@ -7057,7 +7057,7 @@
   },
   {
     "d": 24502,
-    "p": -1
+    "p": -2
   },
   {
     "d": 24516,
@@ -7069,19 +7069,19 @@
   },
   {
     "d": 24544,
-    "p": -1
+    "p": -2
   },
   {
     "d": 24558,
-    "p": -1
+    "p": -2
   },
   {
     "d": 24571,
-    "p": -1
+    "p": -2
   },
   {
     "d": 24585,
-    "p": -1
+    "p": -2
   },
   {
     "d": 24599,
@@ -7141,7 +7141,7 @@
   },
   {
     "d": 24794,
-    "p": -1
+    "p": -2
   },
   {
     "d": 24808,
@@ -7205,7 +7205,7 @@
   },
   {
     "d": 25016,
-    "p": -1
+    "p": -2
   },
   {
     "d": 25030,
@@ -7225,7 +7225,7 @@
   },
   {
     "d": 25085,
-    "p": -1
+    "p": -2
   },
   {
     "d": 25099,
@@ -7277,7 +7277,7 @@
   },
   {
     "d": 25266,
-    "p": -1
+    "p": -2
   },
   {
     "d": 25280,
@@ -7309,7 +7309,7 @@
   },
   {
     "d": 25377,
-    "p": -1
+    "p": -2
   },
   {
     "d": 25391,
@@ -7317,11 +7317,11 @@
   },
   {
     "d": 25405,
-    "p": -1
+    "p": -2
   },
   {
     "d": 25419,
-    "p": -1
+    "p": -2
   },
   {
     "d": 25433,
@@ -7329,7 +7329,7 @@
   },
   {
     "d": 25446,
-    "p": -1
+    "p": -2
   },
   {
     "d": 25460,
@@ -7373,7 +7373,7 @@
   },
   {
     "d": 25599,
-    "p": -1
+    "p": -2
   },
   {
     "d": 25613,
@@ -7389,7 +7389,7 @@
   },
   {
     "d": 25655,
-    "p": -2
+    "p": -1
   },
   {
     "d": 25669,
@@ -7417,7 +7417,7 @@
   },
   {
     "d": 25752,
-    "p": -1
+    "p": -2
   },
   {
     "d": 25766,
@@ -7477,7 +7477,7 @@
   },
   {
     "d": 25960,
-    "p": -2
+    "p": -1
   },
   {
     "d": 25974,
@@ -7505,7 +7505,7 @@
   },
   {
     "d": 26058,
-    "p": -1
+    "p": -2
   },
   {
     "d": 26072,
@@ -7553,15 +7553,15 @@
   },
   {
     "d": 26224,
-    "p": -1
+    "p": -2
   },
   {
     "d": 26238,
-    "p": -1
+    "p": -2
   },
   {
     "d": 26252,
-    "p": -1
+    "p": -2
   },
   {
     "d": 26266,
@@ -7585,11 +7585,11 @@
   },
   {
     "d": 26335,
-    "p": -2
+    "p": -1
   },
   {
     "d": 26349,
-    "p": -2
+    "p": -1
   },
   {
     "d": 26363,
@@ -7609,11 +7609,11 @@
   },
   {
     "d": 26419,
-    "p": -2
+    "p": -1
   },
   {
     "d": 26433,
-    "p": -2
+    "p": -1
   },
   {
     "d": 26447,
@@ -7629,7 +7629,7 @@
   },
   {
     "d": 26488,
-    "p": -1
+    "p": -2
   },
   {
     "d": 26502,
@@ -7649,11 +7649,11 @@
   },
   {
     "d": 26558,
-    "p": -1
+    "p": -2
   },
   {
     "d": 26572,
-    "p": -1
+    "p": -2
   },
   {
     "d": 26585,
@@ -7705,7 +7705,7 @@
   },
   {
     "d": 26752,
-    "p": -1
+    "p": -2
   },
   {
     "d": 26766,
@@ -7757,7 +7757,7 @@
   },
   {
     "d": 26933,
-    "p": -1
+    "p": -2
   },
   {
     "d": 26947,
@@ -7801,7 +7801,7 @@
   },
   {
     "d": 27086,
-    "p": -1
+    "p": -2
   },
   {
     "d": 27099,
@@ -7921,11 +7921,11 @@
   },
   {
     "d": 27502,
-    "p": -1
+    "p": -2
   },
   {
     "d": 27516,
-    "p": -1
+    "p": -2
   },
   {
     "d": 27530,
@@ -7961,7 +7961,7 @@
   },
   {
     "d": 27641,
-    "p": -2
+    "p": -1
   },
   {
     "d": 27655,
@@ -7981,7 +7981,7 @@
   },
   {
     "d": 27711,
-    "p": -1
+    "p": -2
   },
   {
     "d": 27724,
@@ -8037,11 +8037,11 @@
   },
   {
     "d": 27905,
-    "p": -2
+    "p": -1
   },
   {
     "d": 27919,
-    "p": -2
+    "p": -1
   },
   {
     "d": 27933,
@@ -8061,7 +8061,7 @@
   },
   {
     "d": 27988,
-    "p": -1
+    "p": -2
   },
   {
     "d": 28002,
@@ -8201,7 +8201,7 @@
   },
   {
     "d": 28474,
-    "p": -2
+    "p": -1
   },
   {
     "d": 28488,
@@ -8269,7 +8269,7 @@
   },
   {
     "d": 28711,
-    "p": -1
+    "p": -2
   },
   {
     "d": 28725,
@@ -8545,7 +8545,7 @@
   },
   {
     "d": 29669,
-    "p": -1
+    "p": -2
   },
   {
     "d": 29683,
@@ -8657,7 +8657,7 @@
   },
   {
     "d": 30058,
-    "p": -2
+    "p": -1
   },
   {
     "d": 30072,
@@ -8685,7 +8685,7 @@
   },
   {
     "d": 30155,
-    "p": -1
+    "p": -2
   },
   {
     "d": 30169,
@@ -8965,7 +8965,7 @@
   },
   {
     "d": 31127,
-    "p": -1
+    "p": -2
   },
   {
     "d": 31141,
@@ -9029,7 +9029,7 @@
   },
   {
     "d": 31350,
-    "p": -1
+    "p": -2
   },
   {
     "d": 31364,
@@ -9037,7 +9037,7 @@
   },
   {
     "d": 31378,
-    "p": -1
+    "p": -2
   },
   {
     "d": 31391,
@@ -9313,7 +9313,7 @@
   },
   {
     "d": 32336,
-    "p": -1
+    "p": -2
   },
   {
     "d": 32350,
@@ -9385,7 +9385,7 @@
   },
   {
     "d": 32586,
-    "p": -1
+    "p": -2
   },
   {
     "d": 32600,
@@ -9429,7 +9429,7 @@
   },
   {
     "d": 32739,
-    "p": -2
+    "p": -1
   },
   {
     "d": 32753,
@@ -9741,7 +9741,7 @@
   },
   {
     "d": 33822,
-    "p": -1
+    "p": -2
   },
   {
     "d": 33836,
@@ -10009,11 +10009,11 @@
   },
   {
     "d": 34753,
-    "p": -1
+    "p": -2
   },
   {
     "d": 34767,
-    "p": -1
+    "p": -2
   },
   {
     "d": 34781,
@@ -10093,7 +10093,7 @@
   },
   {
     "d": 35044,
-    "p": -1
+    "p": -2
   },
   {
     "d": 35058,
@@ -10257,7 +10257,7 @@
   },
   {
     "d": 35614,
-    "p": -1
+    "p": -2
   },
   {
     "d": 35628,
@@ -11485,7 +11485,7 @@
   },
   {
     "d": 39878,
-    "p": -1
+    "p": -2
   },
   {
     "d": 39892,
@@ -11885,7 +11885,7 @@
   },
   {
     "d": 41267,
-    "p": -2
+    "p": -1
   },
   {
     "d": 41281,
@@ -11893,7 +11893,7 @@
   },
   {
     "d": 41295,
-    "p": -2
+    "p": -1
   },
   {
     "d": 41309,
diff --git a/components/main/uebersicht/NetworkInfo.tsx b/components/main/uebersicht/NetworkInfo.tsx
index 3d84af7..09e8f60 100644
--- a/components/main/uebersicht/NetworkInfo.tsx
+++ b/components/main/uebersicht/NetworkInfo.tsx
@@ -80,8 +80,9 @@ const NetworkInfo: React.FC = () => {
             <p className="text-sm font-medium text-gray-700">{opcUaZustand}</p>
           </div>
         </div>
-
-        <div className="flex items-center space-x-4">
+        {/* OPC UA Nodeset Name */}
+        {/* 
+       <div className="flex items-center space-x-4">
           <div>
             <p className="text-xs text-gray-500">Nodeset Name</p>
             <p className="text-sm font-medium text-gray-700">
@@ -89,6 +90,7 @@ const NetworkInfo: React.FC = () => {
             </p>
           </div>
         </div>
+*/}
       </div>
     </div>
   );
diff --git a/config/webVersion.ts b/config/webVersion.ts
index d57c2c6..fac8cdb 100644
--- a/config/webVersion.ts
+++ b/config/webVersion.ts
@@ -6,5 +6,5 @@
 2: Patch oder Hotfix (Bugfixes oder kleine Änderungen).
 
 */
-const webVersion = "1.6.232";
+const webVersion = "1.6.233";
 export default webVersion;
diff --git a/public/images/IEC.svg b/public/images/IEC.svg
index 2a2b6d4..faf87ce 100644
--- a/public/images/IEC.svg
+++ b/public/images/IEC.svg
@@ -1,9 +1,4 @@
 <svg width="33" height="28" viewBox="0 0 33 28" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="0.467529" y="6" width="32.0116" height="22" rx="3.01911" fill="#0060AC"/>
-<mask id="path-2-outside-1_526_2058" maskUnits="userSpaceOnUse" x="6.47333" y="10.5" width="20" height="12" fill="black">
-<rect fill="white" x="6.47333" y="10.5" width="20" height="12"/>
-<path d="M8.9122 12.0559V21.5H7.66033V12.0559H8.9122ZM17.1888 20.4816V21.5H12.1878V20.4816H17.1888ZM12.4408 12.0559V21.5H11.1889V12.0559H12.4408ZM16.5272 16.1163V17.1347H12.1878V16.1163H16.5272ZM17.1239 12.0559V13.0807H12.1878V12.0559H17.1239ZM24.4406 18.4968H25.6859C25.6211 19.0936 25.4503 19.6276 25.1735 20.0989C24.8968 20.5703 24.5054 20.9443 23.9995 21.2211C23.4936 21.4935 22.8622 21.6297 22.1055 21.6297C21.552 21.6297 21.0482 21.5259 20.5941 21.3184C20.1444 21.1108 19.7574 20.8168 19.4331 20.4362C19.1088 20.0514 18.858 19.5908 18.6807 19.0546C18.5077 18.5141 18.4212 17.913 18.4212 17.2514V16.3109C18.4212 15.6493 18.5077 15.0504 18.6807 14.5142C18.858 13.9737 19.1109 13.511 19.4396 13.1261C19.7725 12.7412 20.1725 12.445 20.6395 12.2375C21.1066 12.0299 21.632 11.9261 22.2157 11.9261C22.9292 11.9261 23.5325 12.0602 24.0254 12.3283C24.5184 12.5964 24.9011 12.9683 25.1735 13.4439C25.4503 13.9153 25.6211 14.4623 25.6859 15.085H24.4406C24.38 14.6439 24.2676 14.2655 24.1033 13.9499C23.9389 13.6299 23.7054 13.3834 23.4027 13.2104C23.1 13.0375 22.7044 12.951 22.2157 12.951C21.7963 12.951 21.4266 13.031 21.1066 13.191C20.7909 13.351 20.525 13.578 20.3087 13.872C20.0969 14.1661 19.9369 14.5185 19.8288 14.9293C19.7206 15.3401 19.6666 15.7963 19.6666 16.2979V17.2514C19.6666 17.7141 19.7142 18.1487 19.8093 18.5552C19.9088 18.9617 20.0579 19.3184 20.2569 19.6254C20.4558 19.9325 20.7087 20.1746 21.0158 20.3519C21.3228 20.5249 21.686 20.6114 22.1055 20.6114C22.6374 20.6114 23.0611 20.527 23.3768 20.3584C23.6925 20.1898 23.9303 19.9476 24.0903 19.6319C24.2546 19.3163 24.3714 18.9379 24.4406 18.4968Z"/>
-</mask>
-<path d="M8.9122 12.0559V21.5H7.66033V12.0559H8.9122ZM17.1888 20.4816V21.5H12.1878V20.4816H17.1888ZM12.4408 12.0559V21.5H11.1889V12.0559H12.4408ZM16.5272 16.1163V17.1347H12.1878V16.1163H16.5272ZM17.1239 12.0559V13.0807H12.1878V12.0559H17.1239ZM24.4406 18.4968H25.6859C25.6211 19.0936 25.4503 19.6276 25.1735 20.0989C24.8968 20.5703 24.5054 20.9443 23.9995 21.2211C23.4936 21.4935 22.8622 21.6297 22.1055 21.6297C21.552 21.6297 21.0482 21.5259 20.5941 21.3184C20.1444 21.1108 19.7574 20.8168 19.4331 20.4362C19.1088 20.0514 18.858 19.5908 18.6807 19.0546C18.5077 18.5141 18.4212 17.913 18.4212 17.2514V16.3109C18.4212 15.6493 18.5077 15.0504 18.6807 14.5142C18.858 13.9737 19.1109 13.511 19.4396 13.1261C19.7725 12.7412 20.1725 12.445 20.6395 12.2375C21.1066 12.0299 21.632 11.9261 22.2157 11.9261C22.9292 11.9261 23.5325 12.0602 24.0254 12.3283C24.5184 12.5964 24.9011 12.9683 25.1735 13.4439C25.4503 13.9153 25.6211 14.4623 25.6859 15.085H24.4406C24.38 14.6439 24.2676 14.2655 24.1033 13.9499C23.9389 13.6299 23.7054 13.3834 23.4027 13.2104C23.1 13.0375 22.7044 12.951 22.2157 12.951C21.7963 12.951 21.4266 13.031 21.1066 13.191C20.7909 13.351 20.525 13.578 20.3087 13.872C20.0969 14.1661 19.9369 14.5185 19.8288 14.9293C19.7206 15.3401 19.6666 15.7963 19.6666 16.2979V17.2514C19.6666 17.7141 19.7142 18.1487 19.8093 18.5552C19.9088 18.9617 20.0579 19.3184 20.2569 19.6254C20.4558 19.9325 20.7087 20.1746 21.0158 20.3519C21.3228 20.5249 21.686 20.6114 22.1055 20.6114C22.6374 20.6114 23.0611 20.527 23.3768 20.3584C23.6925 20.1898 23.9303 19.9476 24.0903 19.6319C24.2546 19.3163 24.3714 18.9379 24.4406 18.4968Z" fill="white"/>
-<path d="M8.9122 12.0559H9.51602V11.452H8.9122V12.0559ZM8.9122 21.5V22.1038H9.51602V21.5H8.9122ZM7.66033 21.5H7.05651V22.1038H7.66033V21.5ZM7.66033 12.0559V11.452H7.05651V12.0559H7.66033ZM8.30838 12.0559V21.5H9.51602V12.0559H8.30838ZM8.9122 20.8962H7.66033V22.1038H8.9122V20.8962ZM8.26415 21.5V12.0559H7.05651V21.5H8.26415ZM7.66033 12.6597H8.9122V11.452H7.66033V12.6597ZM17.1888 20.4816H17.7926V19.8778H17.1888V20.4816ZM17.1888 21.5V22.1038H17.7926V21.5H17.1888ZM12.1878 21.5H11.584V22.1038H12.1878V21.5ZM12.1878 20.4816V19.8778H11.584V20.4816H12.1878ZM12.4408 12.0559H13.0446V11.452H12.4408V12.0559ZM12.4408 21.5V22.1038H13.0446V21.5H12.4408ZM11.1889 21.5H10.5851V22.1038H11.1889V21.5ZM11.1889 12.0559V11.452H10.5851V12.0559H11.1889ZM16.5272 16.1163H17.131V15.5125H16.5272V16.1163ZM16.5272 17.1347V17.7385H17.131V17.1347H16.5272ZM12.1878 17.1347H11.584V17.7385H12.1878V17.1347ZM12.1878 16.1163V15.5125H11.584V16.1163H12.1878ZM17.1239 12.0559H17.7278V11.452H17.1239V12.0559ZM17.1239 13.0807V13.6845H17.7278V13.0807H17.1239ZM12.1878 13.0807H11.584V13.6845H12.1878V13.0807ZM12.1878 12.0559V11.452H11.584V12.0559H12.1878ZM16.585 20.4816V21.5H17.7926V20.4816H16.585ZM17.1888 20.8962H12.1878V22.1038H17.1888V20.8962ZM12.7916 21.5V20.4816H11.584V21.5H12.7916ZM12.1878 21.0855H17.1888V19.8778H12.1878V21.0855ZM11.837 12.0559V21.5H13.0446V12.0559H11.837ZM12.4408 20.8962H11.1889V22.1038H12.4408V20.8962ZM11.7927 21.5V12.0559H10.5851V21.5H11.7927ZM11.1889 12.6597H12.4408V11.452H11.1889V12.6597ZM15.9234 16.1163V17.1347H17.131V16.1163H15.9234ZM16.5272 16.5309H12.1878V17.7385H16.5272V16.5309ZM12.7916 17.1347V16.1163H11.584V17.1347H12.7916ZM12.1878 16.7201H16.5272V15.5125H12.1878V16.7201ZM16.5201 12.0559V13.0807H17.7278V12.0559H16.5201ZM17.1239 12.4769H12.1878V13.6845H17.1239V12.4769ZM12.7916 13.0807V12.0559H11.584V13.0807H12.7916ZM12.1878 12.6597H17.1239V11.452H12.1878V12.6597ZM24.4406 18.4968V17.893H23.9241L23.844 18.4032L24.4406 18.4968ZM25.6859 18.4968L26.2862 18.5621L26.359 17.893H25.6859V18.4968ZM23.9995 21.2211L24.2858 21.7527L24.2893 21.7508L23.9995 21.2211ZM20.5941 21.3184L20.3411 21.8666L20.3431 21.8675L20.5941 21.3184ZM19.4331 20.4362L18.9713 20.8253L18.9735 20.8279L19.4331 20.4362ZM18.6807 19.0546L18.1055 19.2387L18.1074 19.2442L18.6807 19.0546ZM18.6807 14.5142L18.1069 14.326L18.106 14.3288L18.6807 14.5142ZM19.4396 13.1261L18.9829 12.731L18.9804 12.734L19.4396 13.1261ZM25.1735 13.4439L24.6495 13.744L24.6528 13.7497L25.1735 13.4439ZM25.6859 15.085V15.6888H26.3559L26.2865 15.0224L25.6859 15.085ZM24.4406 15.085L23.8423 15.1671L23.914 15.6888H24.4406V15.085ZM24.1033 13.9499L23.5661 14.2257L23.5677 14.2287L24.1033 13.9499ZM21.1066 13.191L20.8365 12.6509L20.8336 12.6524L21.1066 13.191ZM20.3087 13.872L19.8223 13.5143L19.8189 13.519L20.3087 13.872ZM19.8288 14.9293L19.2448 14.7756L19.8288 14.9293ZM19.8093 18.5552L19.2213 18.6928L19.2228 18.6987L19.8093 18.5552ZM21.0158 20.3519L20.7138 20.8748L20.7194 20.878L21.0158 20.3519ZM24.0903 19.6319L23.5547 19.3531L23.5517 19.3589L24.0903 19.6319ZM24.4406 19.1006H25.6859V17.893H24.4406V19.1006ZM25.0857 18.4316C25.0291 18.9518 24.8822 19.4025 24.6528 19.7932L25.6942 20.4047C26.0183 19.8527 26.2131 19.2353 26.2862 18.5621L25.0857 18.4316ZM24.6528 19.7932C24.4345 20.1651 24.1253 20.464 23.7097 20.6913L24.2893 21.7508C24.8855 21.4247 25.3591 20.9755 25.6942 20.4047L24.6528 19.7932ZM23.7132 20.6894C23.3187 20.9019 22.7929 21.0259 22.1055 21.0259V22.2335C22.9316 22.2335 23.6684 22.0852 24.2858 21.7527L23.7132 20.6894ZM22.1055 21.0259C21.6291 21.0259 21.2123 20.937 20.8452 20.7692L20.3431 21.8675C20.8841 22.1149 21.4748 22.2335 22.1055 22.2335V21.0259ZM20.8472 20.7701C20.4776 20.5996 20.1608 20.3592 19.8926 20.0446L18.9735 20.8279C19.354 21.2743 19.8113 21.6221 20.3411 21.8666L20.8472 20.7701ZM19.8948 20.0471C19.6258 19.7278 19.4101 19.3372 19.254 18.8651L18.1074 19.2442C18.3059 19.8445 18.5918 20.3749 18.9714 20.8253L19.8948 20.0471ZM19.2558 18.8706C19.1047 18.3985 19.025 17.8607 19.025 17.2514H17.8174C17.8174 17.9654 17.9107 18.6297 18.1056 19.2387L19.2558 18.8706ZM19.025 17.2514V16.3109H17.8174V17.2514H19.025ZM19.025 16.3109C19.025 15.7015 19.1047 15.1665 19.2553 14.6996L18.106 14.3288C17.9107 14.9343 17.8174 15.5971 17.8174 16.3109H19.025ZM19.2544 14.7024C19.4102 14.2274 19.6272 13.8362 19.8988 13.5182L18.9804 12.734C18.5947 13.1857 18.3057 13.7199 18.1069 14.326L19.2544 14.7024ZM19.8962 13.5212C20.1708 13.2038 20.4985 12.9609 20.8848 12.7892L20.3943 11.6857C19.8465 11.9292 19.3742 12.2787 18.9829 12.731L19.8962 13.5212ZM20.8848 12.7892C21.2644 12.6206 21.7045 12.5299 22.2157 12.5299V11.3223C21.5595 11.3223 20.9488 11.4393 20.3943 11.6857L20.8848 12.7892ZM22.2157 12.5299C22.8552 12.5299 23.3534 12.6501 23.7369 12.8587L24.3139 11.7978C23.7116 11.4702 23.0033 11.3223 22.2157 11.3223V12.5299ZM23.7369 12.8587C24.134 13.0747 24.4341 13.3679 24.6495 13.744L25.6975 13.1438C25.3681 12.5687 24.9028 12.1181 24.3139 11.7978L23.7369 12.8587ZM24.6528 13.7497C24.88 14.1365 25.0282 14.5982 25.0854 15.1475L26.2865 15.0224C26.214 14.3264 26.0206 13.694 25.6942 13.1382L24.6528 13.7497ZM25.6859 14.4812H24.4406V15.6888H25.6859V14.4812ZM25.0388 15.0029C24.9711 14.5097 24.8421 14.0615 24.6389 13.6711L23.5677 14.2287C23.6931 14.4696 23.789 14.7782 23.8423 15.1671L25.0388 15.0029ZM24.6404 13.674C24.4244 13.2535 24.11 12.9191 23.7023 12.6862L23.1032 13.7347C23.3009 13.8477 23.4535 14.0063 23.5661 14.2257L24.6404 13.674ZM23.7023 12.6862C23.279 12.4443 22.7694 12.3471 22.2157 12.3471V13.5548C22.6393 13.5548 22.9211 13.6307 23.1032 13.7347L23.7023 12.6862ZM22.2157 12.3471C21.7187 12.3471 21.2537 12.4423 20.8365 12.6509L21.3766 13.731C21.5994 13.6196 21.8739 13.5548 22.2157 13.5548V12.3471ZM20.8336 12.6524C20.4309 12.8565 20.0927 13.1466 19.8223 13.5143L20.7952 14.2297C20.9572 14.0094 21.1509 13.8454 21.3796 13.7296L20.8336 12.6524ZM19.8189 13.519C19.5569 13.8826 19.3686 14.3053 19.2448 14.7756L20.4127 15.083C20.5051 14.7317 20.6368 14.4496 20.7986 14.225L19.8189 13.519ZM19.2448 14.7756C19.1214 15.2447 19.0628 15.7535 19.0628 16.2979H20.2704C20.2704 15.8391 20.3199 15.4356 20.4127 15.083L19.2448 14.7756ZM19.0628 16.2979V17.2514H20.2704V16.2979H19.0628ZM19.0628 17.2514C19.0628 17.7555 19.1146 18.2366 19.2214 18.6928L20.3972 18.4176C20.3137 18.0608 20.2704 17.6727 20.2704 17.2514H19.0628ZM19.2228 18.6987C19.336 19.1615 19.5096 19.5825 19.7501 19.9538L20.7636 19.2971C20.6063 19.0543 20.4815 18.7618 20.3958 18.4117L19.2228 18.6987ZM19.7501 19.9538C19.9992 20.3383 20.3214 20.6482 20.7138 20.8748L21.3177 19.829C21.0961 19.701 20.9123 19.5266 20.7636 19.2971L19.7501 19.9538ZM20.7194 20.878C21.1327 21.1108 21.602 21.2152 22.1055 21.2152V20.0075C21.7701 20.0075 21.5129 19.9389 21.3121 19.8258L20.7194 20.878ZM22.1055 21.2152C22.6921 21.2152 23.2258 21.1237 23.6613 20.891L23.0923 19.8258C22.8964 19.9304 22.5826 20.0075 22.1055 20.0075V21.2152ZM23.6613 20.891C24.085 20.6646 24.4122 20.3325 24.6289 19.9049L23.5517 19.3589C23.4484 19.5627 23.2999 19.7149 23.0923 19.8258L23.6613 20.891ZM24.6259 19.9107C24.827 19.5244 24.9602 19.0804 25.0371 18.5904L23.844 18.4032C23.7825 18.7954 23.6822 19.1081 23.5547 19.3531L24.6259 19.9107Z" fill="#0060AC" mask="url(#path-2-outside-1_526_2058)"/>
+  <rect x="0.467529" y="6" width="32.0116" height="22" rx="3.01911" fill="#0ea3e8"/>
+  <path d="M8.9122 12.0559V21.5H7.66033V12.0559H8.9122ZM17.1888 20.4816V21.5H12.1878V20.4816H17.1888ZM12.4408 12.0559V21.5H11.1889V12.0559H12.4408ZM16.5272 16.1163V17.1347H12.1878V16.1163H16.5272ZM17.1239 12.0559V13.0807H12.1878V12.0559H17.1239ZM24.4406 18.4968H25.6859C25.6211 19.0936 25.4503 19.6276 25.1735 20.0989C24.8968 20.5703 24.5054 20.9443 23.9995 21.2211C23.4936 21.4935 22.8622 21.6297 22.1055 21.6297C21.552 21.6297 21.0482 21.5259 20.5941 21.3184C20.1444 21.1108 19.7574 20.8168 19.4331 20.4362C19.1088 20.0514 18.858 19.5908 18.6807 19.0546C18.5077 18.5141 18.4212 17.913 18.4212 17.2514V16.3109C18.4212 15.6493 18.5077 15.0504 18.6807 14.5142C18.858 13.9737 19.1109 13.511 19.4396 13.1261C19.7725 12.7412 20.1725 12.445 20.6395 12.2375C21.1066 12.0299 21.632 11.9261 22.2157 11.9261C22.9292 11.9261 23.5325 12.0602 24.0254 12.3283C24.5184 12.5964 24.9011 12.9683 25.1735 13.4439C25.4503 13.9153 25.6211 14.4623 25.6859 15.085H24.4406C24.38 14.6439 24.2676 14.2655 24.1033 13.9499C23.9389 13.6299 23.7054 13.3834 23.4027 13.2104C23.1 13.0375 22.7044 12.951 22.2157 12.951C21.7963 12.951 21.4266 13.031 21.1066 13.191C20.7909 13.351 20.525 13.578 20.3087 13.872C20.0969 14.1661 19.9369 14.5185 19.8288 14.9293C19.7206 15.3401 19.6666 15.7963 19.6666 16.2979V17.2514C19.6666 17.7141 19.7142 18.1487 19.8093 18.5552C19.9088 18.9617 20.0579 19.3184 20.2569 19.6254C20.4558 19.9325 20.7087 20.1746 21.0158 20.3519C21.3228 20.5249 21.686 20.6114 22.1055 20.6114C22.6374 20.6114 23.0611 20.527 23.3768 20.3584C23.6925 20.1898 23.9303 19.9476 24.0903 19.6319C24.2546 19.3163 24.3714 18.9379 24.4406 18.4968Z" fill="white"/>
 </svg>
diff --git a/public/images/IP-icon.svg b/public/images/IP-icon.svg
index ae64a71..7ff6a68 100644
--- a/public/images/IP-icon.svg
+++ b/public/images/IP-icon.svg
@@ -1,10 +1,10 @@
 <svg width="24" height="30" viewBox="0 0 24 30" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_523_7201)">
-<path d="M21.3411 8.66763V27.3411H2.66763V8.66763H21.3411ZM21.3411 6H2.66763C1.20043 6 0 7.20043 0 8.66763V27.3411C0 28.8082 1.20043 30.0087 2.66763 30.0087H21.3411C22.8082 30.0087 24.0087 28.8082 24.0087 27.3411V8.66763C24.0087 7.20043 22.8082 6 21.3411 6ZM8.00289 11.3353H5.33526V24.6734H8.00289V11.3353ZM16.0058 11.3353H10.6705V24.6734H13.3382V19.3382H16.0058C17.473 19.3382 18.6734 18.1377 18.6734 16.6705V14.0029C18.6734 12.5357 17.473 11.3353 16.0058 11.3353ZM16.0058 16.6705H13.3382V14.0029H16.0058V16.6705Z" fill="#6750A4"/>
+<path d="M21.3411 8.66763V27.3411H2.66763V8.66763H21.3411ZM21.3411 6H2.66763C1.20043 6 0 7.20043 0 8.66763V27.3411C0 28.8082 1.20043 30.0087 2.66763 30.0087H21.3411C22.8082 30.0087 24.0087 28.8082 24.0087 27.3411V8.66763C24.0087 7.20043 22.8082 6 21.3411 6ZM8.00289 11.3353H5.33526V24.6734H8.00289V11.3353ZM16.0058 11.3353H10.6705V24.6734H13.3382V19.3382H16.0058C17.473 19.3382 18.6734 18.1377 18.6734 16.6705V14.0029C18.6734 12.5357 17.473 11.3353 16.0058 11.3353ZM16.0058 16.6705H13.3382V14.0029H16.0058V16.6705Z" fill="#0ea3e8"/>
 </g>
 <defs>
 <clipPath id="clip0_523_7201">
 <rect width="24.0087" height="24.0087" fill="white" transform="translate(0 6)"/>
 </clipPath>
 </defs>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/public/images/gateway.svg b/public/images/gateway.svg
index 87e624b..967ed28 100644
--- a/public/images/gateway.svg
+++ b/public/images/gateway.svg
@@ -1,3 +1,3 @@
 <svg width="22" height="27" viewBox="0 0 22 27" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.3503 23.4751V18.8764M11.3503 13.3579V8.75923M4.91213 16.1172H9.51084M17.7885 16.1172H13.1898M12.2986 12.4097L11.3503 13.6743L10.4021 12.4097H12.2986ZM10.4021 19.832L11.3503 18.5674L12.2986 19.832H10.403H10.4021ZM5.83187 17.0654L4.56722 16.1172L5.83187 15.1689V17.0654ZM16.8688 15.1689L18.1334 16.1172L16.8688 17.0654V15.1698V15.1689ZM11.3503 6C16.9378 6 21.4675 10.5297 21.4675 16.1172C21.4675 21.7046 16.9378 26.2344 11.3503 26.2344C5.76289 26.2344 1.23315 21.7046 1.23315 16.1172C1.23315 10.5297 5.76289 6 11.3503 6Z" stroke="#001AFF" stroke-width="1.06497"/>
+<path d="M11.3503 23.4751V18.8764M11.3503 13.3579V8.75923M4.91213 16.1172H9.51084M17.7885 16.1172H13.1898M12.2986 12.4097L11.3503 13.6743L10.4021 12.4097H12.2986ZM10.4021 19.832L11.3503 18.5674L12.2986 19.832H10.403H10.4021ZM5.83187 17.0654L4.56722 16.1172L5.83187 15.1689V17.0654ZM16.8688 15.1689L18.1334 16.1172L16.8688 17.0654V15.1698V15.1689ZM11.3503 6C16.9378 6 21.4675 10.5297 21.4675 16.1172C21.4675 21.7046 16.9378 26.2344 11.3503 26.2344C5.76289 26.2344 1.23315 21.7046 1.23315 16.1172C1.23315 10.5297 5.76289 6 11.3503 6Z" stroke="#001AFF" stroke-width="1.06497" fill="#0ea3e8"/>
 </svg>
diff --git a/public/images/subnet-mask.svg b/public/images/subnet-mask.svg
index 67eca94..c069ceb 100644
--- a/public/images/subnet-mask.svg
+++ b/public/images/subnet-mask.svg
@@ -1,3 +1,3 @@
 <svg width="19" height="25" viewBox="0 0 19 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M15.6222 19.0063C15.1598 19.0053 14.7075 19.1411 14.322 19.3965L11.3405 16.4051L10.4212 17.3246L13.4118 20.307C13.2974 20.5116 13.21 20.7302 13.1517 20.9573H5.1278C5.06289 20.7264 4.96243 20.507 4.83004 20.307L14.322 10.8123C14.7075 11.0678 15.1598 11.2036 15.6222 11.2025C16.1091 11.2045 16.5867 11.0697 17.0007 10.8135C17.4147 10.5573 17.7485 10.1901 17.9641 9.75348C18.1798 9.31689 18.2686 8.82852 18.2204 8.34394C18.1722 7.85936 17.9891 7.39804 17.6917 7.01246C17.3944 6.62689 16.9948 6.33254 16.5384 6.16292C16.0821 5.9933 15.5873 5.95522 15.1104 6.05301C14.6335 6.1508 14.1936 6.38053 13.8408 6.71606C13.488 7.05159 13.2364 7.47945 13.1147 7.95095H5.1551C5.0024 7.394 4.67216 6.90212 4.21454 6.55C3.75691 6.19789 3.19691 6.00478 2.61958 6C1.92988 6 1.26843 6.27406 0.780732 6.76189C0.293038 7.24973 0.0190543 7.91137 0.0190543 8.60127C0.0190543 9.29117 0.293038 9.95281 0.780732 10.4406C1.26843 10.9285 1.92988 11.2025 2.61958 11.2025C3.08199 11.2036 3.53437 11.0678 3.91985 10.8123L6.90136 13.8038L7.82065 12.8843L4.83004 9.90191C4.94443 9.69727 5.03184 9.47868 5.09009 9.25159H13.114C13.179 9.4825 13.2794 9.7019 13.4118 9.90191L3.91985 19.3965C3.53437 19.1411 3.08199 19.0053 2.61958 19.0063C2.13276 19.0044 1.65517 19.1392 1.24115 19.3954C0.827129 19.6515 0.493311 20.0188 0.27768 20.4554C0.0620486 20.892 -0.026737 21.3804 0.0214263 21.865C0.0695897 22.3495 0.252768 22.8109 0.550116 23.1964C0.847465 23.582 1.24704 23.8763 1.70338 24.046C2.15972 24.2156 2.6545 24.2537 3.13141 24.1559C3.60832 24.0581 4.04821 23.8284 4.40104 23.4928C4.75386 23.1573 5.00544 22.7294 5.12715 22.2579H13.0867C13.2069 22.731 13.4573 23.1609 13.8095 23.4987C14.1617 23.8365 14.6016 24.0687 15.0792 24.1689C15.5567 24.2691 16.0528 24.2333 16.511 24.0656C16.9693 23.8979 17.3713 23.6049 17.6714 23.2201C17.9715 22.8352 18.1577 22.3739 18.2087 21.8884C18.2598 21.403 18.1737 20.913 17.9603 20.4741C17.7468 20.0352 17.4146 19.665 17.0013 19.4055C16.588 19.146 16.1102 19.0078 15.6222 19.0063ZM15.6222 7.30063C15.8794 7.30063 16.1308 7.37692 16.3446 7.51983C16.5585 7.66275 16.7251 7.86588 16.8235 8.10354C16.9219 8.3412 16.9477 8.60271 16.8975 8.85501C16.8473 9.10731 16.7235 9.33906 16.5417 9.52096C16.3598 9.70285 16.1281 9.82673 15.8759 9.87691C15.6237 9.9271 15.3622 9.90134 15.1246 9.8029C14.8871 9.70446 14.684 9.53775 14.5411 9.32386C14.3982 9.10998 14.322 8.85851 14.322 8.60127C14.323 8.25664 14.4603 7.92641 14.7039 7.68272C14.9476 7.43903 15.2777 7.30166 15.6222 7.30063ZM2.61958 9.90191C2.36242 9.90191 2.11102 9.82562 1.8972 9.68271C1.68337 9.53979 1.51671 9.33666 1.4183 9.099C1.31988 8.86134 1.29413 8.59983 1.3443 8.34753C1.39447 8.09523 1.51831 7.86348 1.70016 7.68158C1.882 7.49969 2.11369 7.37581 2.36592 7.32563C2.61814 7.27544 2.87958 7.3012 3.11717 7.39964C3.35477 7.49808 3.55784 7.66479 3.70072 7.87868C3.84359 8.09256 3.91985 8.34403 3.91985 8.60127C3.91882 8.9459 3.7815 9.27613 3.53787 9.51982C3.29425 9.76351 2.96412 9.90088 2.61958 9.90191ZM2.61958 22.9083C2.36242 22.9083 2.11102 22.832 1.8972 22.6891C1.68337 22.5461 1.51671 22.343 1.4183 22.1054C1.31988 21.8677 1.29413 21.6062 1.3443 21.3539C1.39447 21.1016 1.51831 20.8698 1.70016 20.6879C1.882 20.506 2.11369 20.3822 2.36592 20.332C2.61814 20.2818 2.87958 20.3075 3.11717 20.406C3.35477 20.5044 3.55784 20.6711 3.70072 20.885C3.84359 21.0989 3.91985 21.3504 3.91985 21.6076C3.91882 21.9523 3.7815 22.2825 3.53787 22.5262C3.29425 22.7699 2.96412 22.9072 2.61958 22.9083ZM15.6222 22.9083C15.3651 22.9083 15.1137 22.832 14.8998 22.6891C14.686 22.5461 14.5194 22.343 14.4209 22.1054C14.3225 21.8677 14.2968 21.6062 14.347 21.3539C14.3971 21.1016 14.521 20.8698 14.7028 20.6879C14.8847 20.506 15.1163 20.3822 15.3686 20.332C15.6208 20.2818 15.8822 20.3075 16.1198 20.406C16.3574 20.5044 16.5605 20.6711 16.7034 20.885C16.8462 21.0989 16.9225 21.3504 16.9225 21.6076C16.9215 21.9523 16.7842 22.2825 16.5405 22.5262C16.2969 22.7699 15.9668 22.9072 15.6222 22.9083Z" fill="#647BA7"/>
+<path d="M15.6222 19.0063C15.1598 19.0053 14.7075 19.1411 14.322 19.3965L11.3405 16.4051L10.4212 17.3246L13.4118 20.307C13.2974 20.5116 13.21 20.7302 13.1517 20.9573H5.1278C5.06289 20.7264 4.96243 20.507 4.83004 20.307L14.322 10.8123C14.7075 11.0678 15.1598 11.2036 15.6222 11.2025C16.1091 11.2045 16.5867 11.0697 17.0007 10.8135C17.4147 10.5573 17.7485 10.1901 17.9641 9.75348C18.1798 9.31689 18.2686 8.82852 18.2204 8.34394C18.1722 7.85936 17.9891 7.39804 17.6917 7.01246C17.3944 6.62689 16.9948 6.33254 16.5384 6.16292C16.0821 5.9933 15.5873 5.95522 15.1104 6.05301C14.6335 6.1508 14.1936 6.38053 13.8408 6.71606C13.488 7.05159 13.2364 7.47945 13.1147 7.95095H5.1551C5.0024 7.394 4.67216 6.90212 4.21454 6.55C3.75691 6.19789 3.19691 6.00478 2.61958 6C1.92988 6 1.26843 6.27406 0.780732 6.76189C0.293038 7.24973 0.0190543 7.91137 0.0190543 8.60127C0.0190543 9.29117 0.293038 9.95281 0.780732 10.4406C1.26843 10.9285 1.92988 11.2025 2.61958 11.2025C3.08199 11.2036 3.53437 11.0678 3.91985 10.8123L6.90136 13.8038L7.82065 12.8843L4.83004 9.90191C4.94443 9.69727 5.03184 9.47868 5.09009 9.25159H13.114C13.179 9.4825 13.2794 9.7019 13.4118 9.90191L3.91985 19.3965C3.53437 19.1411 3.08199 19.0053 2.61958 19.0063C2.13276 19.0044 1.65517 19.1392 1.24115 19.3954C0.827129 19.6515 0.493311 20.0188 0.27768 20.4554C0.0620486 20.892 -0.026737 21.3804 0.0214263 21.865C0.0695897 22.3495 0.252768 22.8109 0.550116 23.1964C0.847465 23.582 1.24704 23.8763 1.70338 24.046C2.15972 24.2156 2.6545 24.2537 3.13141 24.1559C3.60832 24.0581 4.04821 23.8284 4.40104 23.4928C4.75386 23.1573 5.00544 22.7294 5.12715 22.2579H13.0867C13.2069 22.731 13.4573 23.1609 13.8095 23.4987C14.1617 23.8365 14.6016 24.0687 15.0792 24.1689C15.5567 24.2691 16.0528 24.2333 16.511 24.0656C16.9693 23.8979 17.3713 23.6049 17.6714 23.2201C17.9715 22.8352 18.1577 22.3739 18.2087 21.8884C18.2598 21.403 18.1737 20.913 17.9603 20.4741C17.7468 20.0352 17.4146 19.665 17.0013 19.4055C16.588 19.146 16.1102 19.0078 15.6222 19.0063ZM15.6222 7.30063C15.8794 7.30063 16.1308 7.37692 16.3446 7.51983C16.5585 7.66275 16.7251 7.86588 16.8235 8.10354C16.9219 8.3412 16.9477 8.60271 16.8975 8.85501C16.8473 9.10731 16.7235 9.33906 16.5417 9.52096C16.3598 9.70285 16.1281 9.82673 15.8759 9.87691C15.6237 9.9271 15.3622 9.90134 15.1246 9.8029C14.8871 9.70446 14.684 9.53775 14.5411 9.32386C14.3982 9.10998 14.322 8.85851 14.322 8.60127C14.323 8.25664 14.4603 7.92641 14.7039 7.68272C14.9476 7.43903 15.2777 7.30166 15.6222 7.30063ZM2.61958 9.90191C2.36242 9.90191 2.11102 9.82562 1.8972 9.68271C1.68337 9.53979 1.51671 9.33666 1.4183 9.099C1.31988 8.86134 1.29413 8.59983 1.3443 8.34753C1.39447 8.09523 1.51831 7.86348 1.70016 7.68158C1.882 7.49969 2.11369 7.37581 2.36592 7.32563C2.61814 7.27544 2.87958 7.3012 3.11717 7.39964C3.35477 7.49808 3.55784 7.66479 3.70072 7.87868C3.84359 8.09256 3.91985 8.34403 3.91985 8.60127C3.91882 8.9459 3.7815 9.27613 3.53787 9.51982C3.29425 9.76351 2.96412 9.90088 2.61958 9.90191ZM2.61958 22.9083C2.36242 22.9083 2.11102 22.832 1.8972 22.6891C1.68337 22.5461 1.51671 22.343 1.4183 22.1054C1.31988 21.8677 1.29413 21.6062 1.3443 21.3539C1.39447 21.1016 1.51831 20.8698 1.70016 20.6879C1.882 20.506 2.11369 20.3822 2.36592 20.332C2.61814 20.2818 2.87958 20.3075 3.11717 20.406C3.35477 20.5044 3.55784 20.6711 3.70072 20.885C3.84359 21.0989 3.91985 21.3504 3.91985 21.6076C3.91882 21.9523 3.7815 22.2825 3.53787 22.5262C3.29425 22.7699 2.96412 22.9072 2.61958 22.9083ZM15.6222 22.9083C15.3651 22.9083 15.1137 22.832 14.8998 22.6891C14.686 22.5461 14.5194 22.343 14.4209 22.1054C14.3225 21.8677 14.2968 21.6062 14.347 21.3539C14.3971 21.1016 14.521 20.8698 14.7028 20.6879C14.8847 20.506 15.1163 20.3822 15.3686 20.332C15.6208 20.2818 15.8822 20.3075 16.1198 20.406C16.3574 20.5044 16.5605 20.6711 16.7034 20.885C16.8462 21.0989 16.9225 21.3504 16.9225 21.6076C16.9215 21.9523 16.7842 22.2825 16.5405 22.5262C16.2969 22.7699 15.9668 22.9072 15.6222 22.9083Z"  fill="#0ea3e8"/>
 </svg>