diff --git a/cgmes.ipynb b/cgmes.ipynb
index c03418c..aac8b6d 100644
--- a/cgmes.ipynb
+++ b/cgmes.ipynb
@@ -78,7 +78,7 @@
      "data": {
       "image/svg+xml": [
        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n",
-       "<svg width=\"433.95\" height=\"600.00\" viewBox=\"-239.21 -574.95 1361.40 1882.34\" xmlns=\"http://www.w3.org/2000/svg\">\n",
+       "<svg width=\"410.88\" height=\"600.00\" viewBox=\"-533.70 -976.00 1288.21 1881.15\" xmlns=\"http://www.w3.org/2000/svg\">\n",
        "    <style><![CDATA[\n",
        ".nad-branch-edges .nad-edge-path, .nad-3wt-edges .nad-edge-path {stroke: var(--nad-vl-color, lightgrey); stroke-width: 5; fill: none}\n",
        ".nad-branch-edges .nad-winding, .nad-3wt-nodes .nad-winding {stroke: var(--nad-vl-color, lightgrey); stroke-width: 5; fill: none}\n",
@@ -89,19 +89,17 @@
        ".nad-hvdc-edge polyline.nad-hvdc {stroke: grey; stroke-width: 40}\n",
        ".nad-branch-edges .nad-tie-line-edge .nad-edge-path {stroke-width: 7}\n",
        ".nad-pst-arrow {stroke: #6a6a6a; stroke-width: 4; stroke-linecap: round; fill: none}\n",
-       ".nad-state-out .nad-arrow-in {visibility: hidden}\n",
-       ".nad-state-in .nad-arrow-out {visibility: hidden}\n",
-       ".nad-active path {stroke: none; fill: #546e7a}\n",
-       ".nad-reactive path {stroke: none; fill: #0277bd}\n",
-       ".nad-current path {stroke: none; fill: #bd4802}\n",
+       "path.nad-arrow-out:not(.nad-state-out .nad-arrow-out) {visibility: hidden}\n",
+       "path.nad-arrow-in:not(.nad-state-in .nad-arrow-in) {visibility: hidden}\n",
+       ".nad-active {fill: #546e7a}\n",
+       ".nad-reactive {fill: #0277bd}\n",
+       ".nad-current {fill: #bd4802}\n",
        ".nad-text-background {flood-color: #90a4aeaa}\n",
        ".nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central}\n",
        ".nad-text-nodes foreignObject {overflow: visible; color: black}\n",
        ".nad-label-box {background-color: #6c6c6c20; width: max-content; padding: 10px; border-radius: 10px;}\n",
        ".nad-legend-square {width: 20px; height: 20px; background: var(--nad-vl-color, black);}\n",
        ".nad-edge-infos text, .nad-edge-label text {font: 20px serif; dominant-baseline:middle; stroke: #FFFFFFAA; stroke-width: 10; stroke-linejoin:round; paint-order: stroke}\n",
-       ".nad-edge-infos .nad-state-in text {fill: #b71c1c}\n",
-       ".nad-edge-infos .nad-state-out text {fill: #2e7d32}\n",
        ".nad-disconnected {--nad-vl-color: #808080}\n",
        ".nad-vl0to30-line {--nad-vl-color: #afb42b}\n",
        ".nad-vl0to30-0 {--nad-vl-color: #827717}\n",
@@ -190,256 +188,220 @@
        "  40% {stroke: #00BCD4; stroke-width: 15}\n",
        "}\n",
        "]]></style>\n",
-       "    <metadata>\n",
-       "        <nad:nad xmlns:nad=\"http://www.powsybl.org/schema/nad-metadata/1_0\">\n",
-       "            <nad:busNodes>\n",
-       "                <nad:busNode svgId=\"1\" equipmentId=\"2a37dc57-2faf-464a-8175-bc415f9a635f_0\"/>\n",
-       "                <nad:busNode svgId=\"3\" equipmentId=\"8d8a82ba-b5b0-4e94-861a-192af055f2b8_0\"/>\n",
-       "                <nad:busNode svgId=\"5\" equipmentId=\"c1d5bfde8f8011e08e4d00247eb1f55e_0\"/>\n",
-       "                <nad:busNode svgId=\"7\" equipmentId=\"c1d5bfea8f8011e08e4d00247eb1f55e_0\"/>\n",
-       "                <nad:busNode svgId=\"12\" equipmentId=\"7f43f508-2496-4b64-9146-0a40406cbe49\"/>\n",
-       "                <nad:busNode svgId=\"15\" equipmentId=\"e8acf6b6-99cb-45ad-b8dc-16c7866a4ddc\"/>\n",
-       "                <nad:busNode svgId=\"18\" equipmentId=\"dad02278-bd25-476f-8f58-dbe44be72586\"/>\n",
-       "                <nad:busNode svgId=\"21\" equipmentId=\"8fdc7abd-3746-481a-a65e-3df56acd8b13\"/>\n",
-       "                <nad:busNode svgId=\"24\" equipmentId=\"a279a3dc-550b-426c-af3a-61b7be508dcc\"/>\n",
-       "            </nad:busNodes>\n",
-       "            <nad:nodes>\n",
-       "                <nad:node svgId=\"0\" equipmentId=\"2a37dc57-2faf-464a-8175-bc415f9a635f\" x=\"551.14\" y=\"-359.95\"/>\n",
-       "                <nad:node svgId=\"2\" equipmentId=\"8d8a82ba-b5b0-4e94-861a-192af055f2b8\" x=\"-39.21\" y=\"192.89\"/>\n",
-       "                <nad:node svgId=\"4\" equipmentId=\"c1d5bfde8f8011e08e4d00247eb1f55e\" x=\"490.78\" y=\"669.29\"/>\n",
-       "                <nad:node svgId=\"6\" equipmentId=\"c1d5bfea8f8011e08e4d00247eb1f55e\" x=\"383.42\" y=\"72.51\"/>\n",
-       "                <nad:node svgId=\"11\" equipmentId=\"7f43f508-2496-4b64-9146-0a40406cbe49\" x=\"571.81\" y=\"1107.39\"/>\n",
-       "                <nad:node svgId=\"14\" equipmentId=\"e8acf6b6-99cb-45ad-b8dc-16c7866a4ddc\" x=\"107.26\" y=\"876.77\"/>\n",
-       "                <nad:node svgId=\"17\" equipmentId=\"dad02278-bd25-476f-8f58-dbe44be72586\" x=\"922.19\" y=\"725.37\"/>\n",
-       "                <nad:node svgId=\"20\" equipmentId=\"8fdc7abd-3746-481a-a65e-3df56acd8b13\" x=\"822.10\" y=\"33.18\"/>\n",
-       "                <nad:node svgId=\"23\" equipmentId=\"a279a3dc-550b-426c-af3a-61b7be508dcc\" x=\"71.89\" y=\"-271.06\"/>\n",
-       "            </nad:nodes>\n",
-       "            <nad:edges>\n",
-       "                <nad:edge svgId=\"8\" equipmentId=\"2184f365-8cd5-4b5d-8a28-9d68603bb6a4\" node1=\"6\" node2=\"0\"/>\n",
-       "                <nad:edge svgId=\"9\" equipmentId=\"80016742-31b3-432a-b00a-300667a1e572\" node1=\"6\" node2=\"2\"/>\n",
-       "                <nad:edge svgId=\"10\" equipmentId=\"e8a7eaec-51d6-4571-b3d9-c36d52073c33\" node1=\"4\" node2=\"6\"/>\n",
-       "                <nad:edge svgId=\"13\" equipmentId=\"7f43f508-2496-4b64-9146-0a40406cbe49\" node1=\"4\" node2=\"11\"/>\n",
-       "                <nad:edge svgId=\"16\" equipmentId=\"e8acf6b6-99cb-45ad-b8dc-16c7866a4ddc\" node1=\"4\" node2=\"14\"/>\n",
-       "                <nad:edge svgId=\"19\" equipmentId=\"dad02278-bd25-476f-8f58-dbe44be72586\" node1=\"4\" node2=\"17\"/>\n",
-       "                <nad:edge svgId=\"22\" equipmentId=\"8fdc7abd-3746-481a-a65e-3df56acd8b13\" node1=\"6\" node2=\"20\"/>\n",
-       "                <nad:edge svgId=\"25\" equipmentId=\"a279a3dc-550b-426c-af3a-61b7be508dcc\" node1=\"6\" node2=\"23\"/>\n",
-       "            </nad:edges>\n",
-       "        </nad:nad>\n",
-       "    </metadata>\n",
        "    <g class=\"nad-vl-nodes\">\n",
-       "        <g transform=\"translate(551.14,-359.95)\" id=\"0\">\n",
+       "        <g transform=\"translate(239.79,-736.00)\" id=\"0\">\n",
        "            <circle r=\"27.50\" id=\"1\" class=\"nad-vl0to30-0 nad-busnode\"/>\n",
        "        </g>\n",
-       "        <g transform=\"translate(-39.21,192.89)\" id=\"2\">\n",
+       "        <g transform=\"translate(-333.70,-161.14)\" id=\"2\">\n",
        "            <circle r=\"27.50\" id=\"3\" class=\"nad-vl0to30-0 nad-busnode\"/>\n",
        "        </g>\n",
-       "        <g transform=\"translate(490.78,669.29)\" id=\"4\">\n",
+       "        <g transform=\"translate(136.13,287.30)\" id=\"4\">\n",
        "            <circle r=\"27.50\" id=\"5\" class=\"nad-vl300to500-0 nad-busnode\"/>\n",
        "        </g>\n",
-       "        <g transform=\"translate(383.42,72.51)\" id=\"6\">\n",
+       "        <g transform=\"translate(86.33,-302.25)\" id=\"6\">\n",
        "            <circle r=\"27.50\" id=\"7\" class=\"nad-vl180to300-0 nad-busnode\"/>\n",
        "        </g>\n",
-       "        <g transform=\"translate(571.81,1107.39)\" id=\"11\" class=\"nad-boundary-node\">\n",
-       "            <path d=\"M-27.041,5.002 A27.500,27.500 180.000 0 1 27.041,-5.002\" id=\"12\" class=\"nad-vl300to500-0 nad-busnode\"/>\n",
+       "        <g transform=\"translate(265.92,705.15)\" id=\"11\" class=\"nad-boundary-node\">\n",
+       "            <path d=\"M-26.262,8.157 A27.500,27.500 180.000 0 1 26.262,-8.157\" id=\"12\" class=\"nad-vl300to500-0 nad-busnode\"/>\n",
        "        </g>\n",
-       "        <g transform=\"translate(107.26,876.77)\" id=\"14\" class=\"nad-boundary-node\">\n",
-       "            <path d=\"M-13.085,-24.187 A27.500,27.500 180.000 0 1 13.085,24.187\" id=\"15\" class=\"nad-vl300to500-0 nad-busnode\"/>\n",
+       "        <g transform=\"translate(-247.66,529.99)\" id=\"14\" class=\"nad-boundary-node\">\n",
+       "            <path d=\"M-14.698,-23.243 A27.500,27.500 180.000 0 1 14.698,23.243\" id=\"15\" class=\"nad-vl300to500-0 nad-busnode\"/>\n",
        "        </g>\n",
-       "        <g transform=\"translate(922.19,725.37)\" id=\"17\" class=\"nad-boundary-node\">\n",
-       "            <path d=\"M-3.545,27.271 A27.500,27.500 180.000 0 1 3.545,-27.271\" id=\"18\" class=\"nad-vl300to500-0 nad-busnode\"/>\n",
+       "        <g transform=\"translate(554.51,282.29)\" id=\"17\" class=\"nad-boundary-node\">\n",
+       "            <path d=\"M0.330,27.498 A27.500,27.500 180.000 0 1 -0.330,-27.498\" id=\"18\" class=\"nad-vl300to500-0 nad-busnode\"/>\n",
        "        </g>\n",
-       "        <g transform=\"translate(822.10,33.18)\" id=\"20\" class=\"nad-boundary-node\">\n",
-       "            <path d=\"M2.456,27.390 A27.500,27.500 180.000 0 1 -2.456,-27.390\" id=\"21\" class=\"nad-vl180to300-0 nad-busnode\"/>\n",
+       "        <g transform=\"translate(546.15,-380.95)\" id=\"20\" class=\"nad-boundary-node\">\n",
+       "            <path d=\"M4.639,27.106 A27.500,27.500 180.000 0 1 -4.639,-27.106\" id=\"21\" class=\"nad-vl180to300-0 nad-busnode\"/>\n",
        "        </g>\n",
-       "        <g transform=\"translate(71.89,-271.06)\" id=\"23\" class=\"nad-boundary-node\">\n",
-       "            <path d=\"M20.372,-18.472 A27.500,27.500 180.000 0 1 -20.372,18.472\" id=\"24\" class=\"nad-vl180to300-0 nad-busnode\"/>\n",
+       "        <g transform=\"translate(-228.53,-624.92)\" id=\"23\" class=\"nad-boundary-node\">\n",
+       "            <path d=\"M19.682,-19.206 A27.500,27.500 180.000 0 1 -19.682,19.206\" id=\"24\" class=\"nad-vl180to300-0 nad-busnode\"/>\n",
        "        </g>\n",
        "    </g>\n",
        "    <g class=\"nad-branch-edges\">\n",
        "        <g id=\"8\">\n",
        "            <g id=\"8.1\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"393.37,46.87 456.44,-115.75\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(405.12,16.57)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(21.20)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"95.50,-328.18 153.05,-490.84\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(106.34,-358.82)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(19.48)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-68.80)\" x=\"19.00\"></text>\n",
+       "                        <text transform=\"rotate(-70.52)\" x=\"19.00\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"8.2\" class=\"nad-vl0to30-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"541.20,-334.31 478.13,-171.69\"/>\n",
-       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(529.45,-304.01)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(-158.80)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"230.62,-710.07 173.07,-547.41\"/>\n",
+       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(219.78,-679.43)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(-160.52)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-68.80)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
+       "                        <text transform=\"rotate(-70.52)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g class=\"nad-glued-center\">\n",
-       "                <circle class=\"nad-vl180to300-line nad-winding\" cx=\"463.67\" cy=\"-134.40\" r=\"20.00\"/>\n",
-       "                <circle class=\"nad-vl0to30-line nad-winding\" cx=\"470.90\" cy=\"-153.04\" r=\"20.00\"/>\n",
+       "                <circle class=\"nad-vl180to300-line nad-winding\" cx=\"159.73\" cy=\"-509.70\" r=\"20.00\"/>\n",
+       "                <circle class=\"nad-vl0to30-line nad-winding\" cx=\"166.40\" cy=\"-528.55\" r=\"20.00\"/>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"9\">\n",
        "            <g id=\"9.1\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"356.98,80.05 200.96,124.48\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(325.72,88.95)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(-105.90)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"60.26,-293.49 -95.25,-241.25\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(29.45,-283.14)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(-108.57)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-15.90)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
+       "                        <text transform=\"rotate(-18.57)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"9.2\" class=\"nad-vl0to30-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"-12.76,185.36 143.26,140.92\"/>\n",
-       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(18.50,176.45)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(74.10)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"-307.63,-169.90 -152.12,-222.14\"/>\n",
+       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(-276.83,-180.25)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(71.43)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-15.90)\" x=\"19.00\"></text>\n",
+       "                        <text transform=\"rotate(-18.57)\" x=\"19.00\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g class=\"nad-glued-center\">\n",
-       "                <circle class=\"nad-vl180to300-line nad-winding\" cx=\"181.73\" cy=\"129.96\" r=\"20.00\"/>\n",
-       "                <circle class=\"nad-vl0to30-line nad-winding\" cx=\"162.49\" cy=\"135.44\" r=\"20.00\"/>\n",
+       "                <circle class=\"nad-vl180to300-line nad-winding\" cx=\"-114.21\" cy=\"-234.88\" r=\"20.00\"/>\n",
+       "                <circle class=\"nad-vl0to30-line nad-winding\" cx=\"-133.16\" cy=\"-228.51\" r=\"20.00\"/>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"10\">\n",
        "            <g id=\"10.1\" class=\"nad-vl300to500-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"485.91,642.23 442.41,400.43\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(480.16,610.24)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(-10.20)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"133.82,259.90 113.76,22.42\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(131.08,227.52)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(-4.83)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-280.20)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
+       "                        <text transform=\"rotate(-274.83)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"10.2\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"388.29,99.58 431.79,341.38\"/>\n",
-       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(394.05,131.57)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(169.80)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"88.65,-274.85 108.71,-37.37\"/>\n",
+       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(91.38,-242.46)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(175.17)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(79.80)\" x=\"19.00\"></text>\n",
+       "                        <text transform=\"rotate(85.17)\" x=\"19.00\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g class=\"nad-glued-center\">\n",
-       "                <circle class=\"nad-vl300to500-line nad-winding\" cx=\"438.87\" cy=\"380.74\" r=\"20.00\"/>\n",
-       "                <circle class=\"nad-vl180to300-line nad-winding\" cx=\"435.33\" cy=\"361.06\" r=\"20.00\"/>\n",
+       "                <circle class=\"nad-vl300to500-line nad-winding\" cx=\"112.07\" cy=\"2.49\" r=\"20.00\"/>\n",
+       "                <circle class=\"nad-vl180to300-line nad-winding\" cx=\"110.39\" cy=\"-17.44\" r=\"20.00\"/>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"13\" class=\"nad-dangling-line-edge\">\n",
        "            <g id=\"13.1\" class=\"nad-vl300to500-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"495.78,696.33 531.30,888.34\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(501.69,728.29)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"144.29,313.57 201.03,496.23\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(153.93,344.60)\">\n",
        "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(169.52)\">\n",
+       "                        <g transform=\"rotate(162.74)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(79.52)\" x=\"19.00\">52</text>\n",
+       "                        <text transform=\"rotate(72.74)\" x=\"19.00\">52</text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"13.2\" class=\"nad-vl300to500-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"566.81,1080.35 531.30,888.34\"/>\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"257.76,678.89 201.03,496.23\"/>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"16\" class=\"nad-dangling-line-edge\">\n",
        "            <g id=\"16.1\" class=\"nad-vl300to500-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"466.59,682.38 299.02,773.03\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(438.01,697.84)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"112.89,302.00 -55.76,408.65\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(85.42,319.37)\">\n",
        "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(-118.41)\">\n",
+       "                        <g transform=\"rotate(-122.31)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-28.41)\" x=\"-19.00\" style=\"text-anchor:end\">96</text>\n",
+       "                        <text transform=\"rotate(-32.31)\" x=\"-19.00\" style=\"text-anchor:end\">96</text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"16.2\" class=\"nad-vl300to500-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"131.44,863.69 299.02,773.03\"/>\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"-224.41,515.30 -55.76,408.65\"/>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"19\" class=\"nad-dangling-line-edge\">\n",
        "            <g id=\"19.1\" class=\"nad-vl300to500-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"518.05,672.84 706.49,697.33\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(550.28,677.03)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"163.63,286.97 345.32,284.80\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(196.13,286.59)\">\n",
        "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(97.41)\">\n",
+       "                        <g transform=\"rotate(89.31)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(7.41)\" x=\"19.00\">51</text>\n",
+       "                        <text transform=\"rotate(-0.69)\" x=\"19.00\">51</text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"19.2\" class=\"nad-vl300to500-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"894.92,721.83 706.49,697.33\"/>\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"527.01,282.62 345.32,284.80\"/>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"22\" class=\"nad-dangling-line-edge\">\n",
        "            <g id=\"22.1\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"410.81,70.06 602.76,52.85\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(443.19,67.16)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"113.44,-306.89 316.24,-341.60\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(145.47,-312.37)\">\n",
        "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(84.88)\">\n",
+       "                        <g transform=\"rotate(80.29)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-5.12)\" x=\"19.00\">29</text>\n",
+       "                        <text transform=\"rotate(-9.71)\" x=\"19.00\">29</text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"22.2\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"794.71,35.64 602.76,52.85\"/>\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"519.05,-376.31 316.24,-341.60\"/>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"25\" class=\"nad-dangling-line-edge\">\n",
        "            <g id=\"25.1\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"364.95,52.14 227.66,-99.28\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(343.12,28.06)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"67.13,-321.93 -71.10,-463.59\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(44.43,-345.19)\">\n",
        "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(-42.20)\">\n",
+       "                        <g transform=\"rotate(-44.30)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-312.20)\" x=\"-19.00\" style=\"text-anchor:end\">28</text>\n",
+       "                        <text transform=\"rotate(-314.30)\" x=\"-19.00\" style=\"text-anchor:end\">28</text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"25.2\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"90.37,-250.69 227.66,-99.28\"/>\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"-209.32,-605.24 -71.10,-463.59\"/>\n",
        "            </g>\n",
        "        </g>\n",
        "    </g>\n",
        "    <g class=\"nad-text-edges\">\n",
-       "        <polyline id=\"0-textedge\" points=\"580.81,-364.40 651.14,-374.95\"/>\n",
-       "        <polyline id=\"2-textedge\" points=\"-9.54,188.44 60.79,177.89\"/>\n",
-       "        <polyline id=\"4-textedge\" points=\"520.45,664.84 590.78,654.29\"/>\n",
-       "        <polyline id=\"6-textedge\" points=\"413.09,68.06 483.42,57.51\"/>\n",
+       "        <polyline id=\"0-textedge\" points=\"269.46,-740.45 339.79,-751.00\"/>\n",
+       "        <polyline id=\"2-textedge\" points=\"-304.03,-165.59 -233.70,-176.14\"/>\n",
+       "        <polyline id=\"4-textedge\" points=\"165.80,282.85 236.13,272.30\"/>\n",
+       "        <polyline id=\"6-textedge\" points=\"116.00,-306.70 186.33,-317.25\"/>\n",
        "    </g>\n",
        "    <g class=\"nad-text-nodes\">\n",
-       "        <foreignObject id=\"0-textnode\" y=\"-399.95\" x=\"651.14\" height=\"1\" width=\"1\">\n",
+       "        <foreignObject id=\"0-textnode\" y=\"-776.00\" x=\"339.79\" height=\"1\" width=\"1\">\n",
        "            <div xmlns=\"http://www.w3.org/1999/xhtml\" class=\"nad-label-box\">\n",
        "                <div>15.8</div>\n",
        "                <table>\n",
@@ -452,7 +414,7 @@
        "                </table>\n",
        "            </div>\n",
        "        </foreignObject>\n",
-       "        <foreignObject id=\"2-textnode\" y=\"152.89\" x=\"60.79\" height=\"1\" width=\"1\">\n",
+       "        <foreignObject id=\"2-textnode\" y=\"-201.14\" x=\"-233.70\" height=\"1\" width=\"1\">\n",
        "            <div xmlns=\"http://www.w3.org/1999/xhtml\" class=\"nad-label-box\">\n",
        "                <div>15.8</div>\n",
        "                <table>\n",
@@ -465,7 +427,7 @@
        "                </table>\n",
        "            </div>\n",
        "        </foreignObject>\n",
-       "        <foreignObject id=\"4-textnode\" y=\"629.29\" x=\"590.78\" height=\"1\" width=\"1\">\n",
+       "        <foreignObject id=\"4-textnode\" y=\"247.30\" x=\"236.13\" height=\"1\" width=\"1\">\n",
        "            <div xmlns=\"http://www.w3.org/1999/xhtml\" class=\"nad-label-box\">\n",
        "                <div>400.0</div>\n",
        "                <table>\n",
@@ -478,7 +440,7 @@
        "                </table>\n",
        "            </div>\n",
        "        </foreignObject>\n",
-       "        <foreignObject id=\"6-textnode\" y=\"32.51\" x=\"483.42\" height=\"1\" width=\"1\">\n",
+       "        <foreignObject id=\"6-textnode\" y=\"-342.25\" x=\"186.33\" height=\"1\" width=\"1\">\n",
        "            <div xmlns=\"http://www.w3.org/1999/xhtml\" class=\"nad-label-box\">\n",
        "                <div>220.0</div>\n",
        "                <table>\n",
@@ -495,7 +457,7 @@
        "</svg>\n"
       ],
       "text/plain": [
-       "<pypowsybl.network.impl.svg.Svg at 0x7f8a5497e070>"
+       "<pypowsybl.network.impl.svg.Svg at 0x7855a3926950>"
       ]
      },
      "execution_count": 4,
@@ -516,7 +478,7 @@
      "data": {
       "image/svg+xml": [
        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n",
-       "<svg width=\"490.19\" height=\"600.00\" viewBox=\"-477.88 -706.31 1931.86 2364.64\" xmlns=\"http://www.w3.org/2000/svg\">\n",
+       "<svg width=\"487.54\" height=\"600.00\" viewBox=\"-799.28 -1059.89 1811.69 2229.57\" xmlns=\"http://www.w3.org/2000/svg\">\n",
        "    <style><![CDATA[\n",
        ".nad-branch-edges .nad-edge-path, .nad-3wt-edges .nad-edge-path {stroke: var(--nad-vl-color, lightgrey); stroke-width: 5; fill: none}\n",
        ".nad-branch-edges .nad-winding, .nad-3wt-nodes .nad-winding {stroke: var(--nad-vl-color, lightgrey); stroke-width: 5; fill: none}\n",
@@ -527,19 +489,17 @@
        ".nad-hvdc-edge polyline.nad-hvdc {stroke: grey; stroke-width: 40}\n",
        ".nad-branch-edges .nad-tie-line-edge .nad-edge-path {stroke-width: 7}\n",
        ".nad-pst-arrow {stroke: #6a6a6a; stroke-width: 4; stroke-linecap: round; fill: none}\n",
-       ".nad-state-out .nad-arrow-in {visibility: hidden}\n",
-       ".nad-state-in .nad-arrow-out {visibility: hidden}\n",
-       ".nad-active path {stroke: none; fill: #546e7a}\n",
-       ".nad-reactive path {stroke: none; fill: #0277bd}\n",
-       ".nad-current path {stroke: none; fill: #bd4802}\n",
+       "path.nad-arrow-out:not(.nad-state-out .nad-arrow-out) {visibility: hidden}\n",
+       "path.nad-arrow-in:not(.nad-state-in .nad-arrow-in) {visibility: hidden}\n",
+       ".nad-active {fill: #546e7a}\n",
+       ".nad-reactive {fill: #0277bd}\n",
+       ".nad-current {fill: #bd4802}\n",
        ".nad-text-background {flood-color: #90a4aeaa}\n",
        ".nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central}\n",
        ".nad-text-nodes foreignObject {overflow: visible; color: black}\n",
        ".nad-label-box {background-color: #6c6c6c20; width: max-content; padding: 10px; border-radius: 10px;}\n",
        ".nad-legend-square {width: 20px; height: 20px; background: var(--nad-vl-color, black);}\n",
        ".nad-edge-infos text, .nad-edge-label text {font: 20px serif; dominant-baseline:middle; stroke: #FFFFFFAA; stroke-width: 10; stroke-linejoin:round; paint-order: stroke}\n",
-       ".nad-edge-infos .nad-state-in text {fill: #b71c1c}\n",
-       ".nad-edge-infos .nad-state-out text {fill: #2e7d32}\n",
        ".nad-disconnected {--nad-vl-color: #808080}\n",
        ".nad-vl0to30-line {--nad-vl-color: #afb42b}\n",
        ".nad-vl0to30-0 {--nad-vl-color: #827717}\n",
@@ -628,372 +588,326 @@
        "  40% {stroke: #00BCD4; stroke-width: 15}\n",
        "}\n",
        "]]></style>\n",
-       "    <metadata>\n",
-       "        <nad:nad xmlns:nad=\"http://www.powsybl.org/schema/nad-metadata/1_0\">\n",
-       "            <nad:busNodes>\n",
-       "                <nad:busNode svgId=\"1\" equipmentId=\"469df5f7-058f-4451-a998-57a48e8a56fe_0\"/>\n",
-       "                <nad:busNode svgId=\"3\" equipmentId=\"4ba71b59-ee2f-450b-9f7d-cc2f1cc5e386_0\"/>\n",
-       "                <nad:busNode svgId=\"5\" equipmentId=\"8bbd7e74-ae20-4dce-8780-c20f8e18c2e0_0\"/>\n",
-       "                <nad:busNode svgId=\"7\" equipmentId=\"929ba893-c9dc-44d7-b1fd-30834bd3ab85_0\"/>\n",
-       "                <nad:busNode svgId=\"9\" equipmentId=\"b10b171b-3bc5-4849-bb1f-61ed9ea1ec7c_0\"/>\n",
-       "                <nad:busNode svgId=\"11\" equipmentId=\"d0486169-2205-40b2-895e-b672ecb9e5fc_0\"/>\n",
-       "                <nad:busNode svgId=\"18\" equipmentId=\"78736387-5f60-4832-b3fe-d50daf81b0a6\"/>\n",
-       "                <nad:busNode svgId=\"21\" equipmentId=\"b18cd1aa-7808-49b9-a7cf-605eaf07b006\"/>\n",
-       "                <nad:busNode svgId=\"24\" equipmentId=\"ed0c5d75-4a54-43c8-b782-b20d7431630b\"/>\n",
-       "                <nad:busNode svgId=\"31\" equipmentId=\"17086487-56ba-4979-b8de-064025a6b4da\"/>\n",
-       "                <nad:busNode svgId=\"34\" equipmentId=\"a16b4a6c-70b1-4abf-9a9d-bd0fa47f9fe4\"/>\n",
-       "            </nad:busNodes>\n",
-       "            <nad:nodes>\n",
-       "                <nad:node svgId=\"0\" equipmentId=\"469df5f7-058f-4451-a998-57a48e8a56fe\" x=\"585.81\" y=\"-48.80\"/>\n",
-       "                <nad:node svgId=\"2\" equipmentId=\"4ba71b59-ee2f-450b-9f7d-cc2f1cc5e386\" x=\"-186.18\" y=\"322.62\"/>\n",
-       "                <nad:node svgId=\"4\" equipmentId=\"8bbd7e74-ae20-4dce-8780-c20f8e18c2e0\" x=\"232.09\" y=\"298.30\"/>\n",
-       "                <nad:node svgId=\"6\" equipmentId=\"929ba893-c9dc-44d7-b1fd-30834bd3ab85\" x=\"1153.98\" y=\"-110.02\"/>\n",
-       "                <nad:node svgId=\"8\" equipmentId=\"b10b171b-3bc5-4849-bb1f-61ed9ea1ec7c\" x=\"444.52\" y=\"660.00\"/>\n",
-       "                <nad:node svgId=\"10\" equipmentId=\"d0486169-2205-40b2-895e-b672ecb9e5fc\" x=\"148.37\" y=\"1070.53\"/>\n",
-       "                <nad:node svgId=\"13\" equipmentId=\"84ed55f4-61f5-4d9d-8755-bba7b877a246\" x=\"766.80\" y=\"268.94\"/>\n",
-       "                <nad:node svgId=\"17\" equipmentId=\"78736387-5f60-4832-b3fe-d50daf81b0a6\" x=\"1116.71\" y=\"252.13\"/>\n",
-       "                <nad:node svgId=\"20\" equipmentId=\"b18cd1aa-7808-49b9-a7cf-605eaf07b006\" x=\"656.64\" y=\"-506.31\"/>\n",
-       "                <nad:node svgId=\"23\" equipmentId=\"ed0c5d75-4a54-43c8-b782-b20d7431630b\" x=\"197.99\" y=\"-318.67\"/>\n",
-       "                <nad:node svgId=\"30\" equipmentId=\"17086487-56ba-4979-b8de-064025a6b4da\" x=\"-277.88\" y=\"1089.34\"/>\n",
-       "                <nad:node svgId=\"33\" equipmentId=\"a16b4a6c-70b1-4abf-9a9d-bd0fa47f9fe4\" x=\"248.71\" y=\"1458.33\"/>\n",
-       "            </nad:nodes>\n",
-       "            <nad:edges>\n",
-       "                <nad:edge svgId=\"12\" equipmentId=\"a708c3bc-465d-4fe7-b6ef-6fa6408a62b0\" node1=\"0\" node2=\"4\"/>\n",
-       "                <nad:edge svgId=\"19\" equipmentId=\"78736387-5f60-4832-b3fe-d50daf81b0a6\" node1=\"0\" node2=\"17\"/>\n",
-       "                <nad:edge svgId=\"22\" equipmentId=\"b18cd1aa-7808-49b9-a7cf-605eaf07b006\" node1=\"0\" node2=\"20\"/>\n",
-       "                <nad:edge svgId=\"25\" equipmentId=\"ed0c5d75-4a54-43c8-b782-b20d7431630b\" node1=\"0\" node2=\"23\"/>\n",
-       "                <nad:edge svgId=\"26\" equipmentId=\"e482b89a-fa84-4ea9-8e70-a83d44790957\" node1=\"4\" node2=\"2\"/>\n",
-       "                <nad:edge svgId=\"27\" equipmentId=\"b94318f6-6d24-4f56-96b9-df2531ad6543\" node1=\"8\" node2=\"4\"/>\n",
-       "                <nad:edge svgId=\"28\" equipmentId=\"b58bf21a-096a-4dae-9a01-3f03b60c24c7\" node1=\"8\" node2=\"10\"/>\n",
-       "                <nad:edge svgId=\"29\" equipmentId=\"ffbabc27-1ccd-4fdc-b037-e341706c8d29\" node1=\"8\" node2=\"10\"/>\n",
-       "                <nad:edge svgId=\"32\" equipmentId=\"17086487-56ba-4979-b8de-064025a6b4da\" node1=\"10\" node2=\"30\"/>\n",
-       "                <nad:edge svgId=\"35\" equipmentId=\"a16b4a6c-70b1-4abf-9a9d-bd0fa47f9fe4\" node1=\"10\" node2=\"33\"/>\n",
-       "                <nad:edge svgId=\"14\" equipmentId=\"84ed55f4-61f5-4d9d-8755-bba7b877a246\" node1=\"0\" node2=\"13\"/>\n",
-       "                <nad:edge svgId=\"15\" equipmentId=\"84ed55f4-61f5-4d9d-8755-bba7b877a246\" node1=\"8\" node2=\"13\"/>\n",
-       "                <nad:edge svgId=\"16\" equipmentId=\"84ed55f4-61f5-4d9d-8755-bba7b877a246\" node1=\"6\" node2=\"13\"/>\n",
-       "            </nad:edges>\n",
-       "        </nad:nad>\n",
-       "    </metadata>\n",
        "    <g class=\"nad-vl-nodes\">\n",
-       "        <g transform=\"translate(585.81,-48.80)\" id=\"0\">\n",
+       "        <g transform=\"translate(205.07,-386.15)\" id=\"0\">\n",
        "            <circle r=\"27.50\" id=\"1\" class=\"nad-vl300to500-0 nad-busnode\"/>\n",
        "        </g>\n",
-       "        <g transform=\"translate(-186.18,322.62)\" id=\"2\">\n",
+       "        <g transform=\"translate(-576.33,433.09)\" id=\"2\">\n",
        "            <circle r=\"27.50\" id=\"3\" class=\"nad-vl0to30-0 nad-busnode\"/>\n",
        "        </g>\n",
-       "        <g transform=\"translate(232.09,298.30)\" id=\"4\">\n",
+       "        <g transform=\"translate(-127.98,51.83)\" id=\"4\">\n",
        "            <circle r=\"27.50\" id=\"5\" class=\"nad-vl70to120-0 nad-busnode\"/>\n",
        "        </g>\n",
-       "        <g transform=\"translate(1153.98,-110.02)\" id=\"6\">\n",
+       "        <g transform=\"translate(712.41,-587.89)\" id=\"6\">\n",
        "            <circle r=\"27.50\" id=\"7\" class=\"nad-vl0to30-0 nad-busnode\"/>\n",
        "        </g>\n",
-       "        <g transform=\"translate(444.52,660.00)\" id=\"8\">\n",
+       "        <g transform=\"translate(184.11,274.36)\" id=\"8\">\n",
        "            <circle r=\"27.50\" id=\"9\" class=\"nad-vl180to300-0 nad-busnode\"/>\n",
        "        </g>\n",
-       "        <g transform=\"translate(148.37,1070.53)\" id=\"10\">\n",
+       "        <g transform=\"translate(-182.69,542.18)\" id=\"10\">\n",
        "            <circle r=\"27.50\" id=\"11\" class=\"nad-vl180to300-0 nad-busnode\"/>\n",
        "        </g>\n",
-       "        <g transform=\"translate(1116.71,252.13)\" id=\"17\" class=\"nad-boundary-node\">\n",
-       "            <path d=\"M-13.561,23.924 A27.500,27.500 180.000 0 1 13.561,-23.924\" id=\"18\" class=\"nad-vl300to500-0 nad-busnode\"/>\n",
+       "        <g transform=\"translate(804.13,-233.26)\" id=\"17\" class=\"nad-boundary-node\">\n",
+       "            <path d=\"M-6.800,26.646 A27.500,27.500 180.000 0 1 6.800,-26.646\" id=\"18\" class=\"nad-vl300to500-0 nad-busnode\"/>\n",
        "        </g>\n",
-       "        <g transform=\"translate(656.64,-506.31)\" id=\"20\" class=\"nad-boundary-node\">\n",
-       "            <path d=\"M27.176,4.208 A27.500,27.500 180.000 0 1 -27.176,-4.208\" id=\"21\" class=\"nad-vl300to500-0 nad-busnode\"/>\n",
+       "        <g transform=\"translate(180.21,-859.89)\" id=\"20\" class=\"nad-boundary-node\">\n",
+       "            <path d=\"M27.462,-1.441 A27.500,27.500 180.000 0 1 -27.462,1.441\" id=\"21\" class=\"nad-vl300to500-0 nad-busnode\"/>\n",
        "        </g>\n",
-       "        <g transform=\"translate(197.99,-318.67)\" id=\"23\" class=\"nad-boundary-node\">\n",
-       "            <path d=\"M15.707,-22.573 A27.500,27.500 180.000 0 1 -15.707,22.573\" id=\"24\" class=\"nad-vl300to500-0 nad-busnode\"/>\n",
+       "        <g transform=\"translate(-202.77,-581.18)\" id=\"23\" class=\"nad-boundary-node\">\n",
+       "            <path d=\"M11.864,-24.809 A27.500,27.500 180.000 0 1 -11.864,24.809\" id=\"24\" class=\"nad-vl300to500-0 nad-busnode\"/>\n",
        "        </g>\n",
-       "        <g transform=\"translate(-277.88,1089.34)\" id=\"30\" class=\"nad-boundary-node\">\n",
-       "            <path d=\"M-1.212,-27.473 A27.500,27.500 180.000 0 1 1.212,27.473\" id=\"31\" class=\"nad-vl180to300-0 nad-busnode\"/>\n",
+       "        <g transform=\"translate(-599.28,123.07)\" id=\"30\" class=\"nad-boundary-node\">\n",
+       "            <path d=\"M19.504,-19.387 A27.500,27.500 180.000 0 1 -19.504,19.387\" id=\"31\" class=\"nad-vl180to300-0 nad-busnode\"/>\n",
        "        </g>\n",
-       "        <g transform=\"translate(248.71,1458.33)\" id=\"33\" class=\"nad-boundary-node\">\n",
-       "            <path d=\"M-26.623,6.888 A27.500,27.500 180.000 0 1 26.623,-6.888\" id=\"34\" class=\"nad-vl180to300-0 nad-busnode\"/>\n",
+       "        <g transform=\"translate(-158.68,969.68)\" id=\"33\" class=\"nad-boundary-node\">\n",
+       "            <path d=\"M-27.457,1.542 A27.500,27.500 180.000 0 1 27.457,-1.542\" id=\"34\" class=\"nad-vl180to300-0 nad-busnode\"/>\n",
        "        </g>\n",
        "    </g>\n",
        "    <g class=\"nad-branch-edges\">\n",
        "        <g id=\"12\">\n",
        "            <g id=\"12.1\" class=\"nad-vl300to500-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"566.18,-29.54 430.37,103.74\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(542.99,-6.78)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(-134.46)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"188.43,-364.26 56.71,-191.04\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(168.75,-338.39)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(-142.75)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-44.46)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
+       "                        <text transform=\"rotate(-52.75)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"12.2\" class=\"nad-vl70to120-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"251.72,279.04 387.54,145.76\"/>\n",
-       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(274.92,256.28)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(45.54)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"-111.33,29.94 20.39,-143.28\"/>\n",
+       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(-91.66,4.07)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(37.25)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-44.46)\" x=\"19.00\"></text>\n",
+       "                        <text transform=\"rotate(-52.75)\" x=\"19.00\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g class=\"nad-glued-center\">\n",
-       "                <circle class=\"nad-vl300to500-line nad-winding\" cx=\"416.09\" cy=\"117.75\" r=\"20.00\"/>\n",
-       "                <circle class=\"nad-vl70to120-line nad-winding\" cx=\"401.82\" cy=\"131.75\" r=\"20.00\"/>\n",
-       "                <path d=\"M60.00,0 0,60.00 M52.00,0 60.00,0 60.00,8.00\" transform=\"matrix(-0.71,0.70,-0.70,-0.71,451.38,125.15)\" class=\"nad-pst-arrow\"/>\n",
+       "                <circle class=\"nad-vl300to500-line nad-winding\" cx=\"44.60\" cy=\"-175.12\" r=\"20.00\"/>\n",
+       "                <circle class=\"nad-vl70to120-line nad-winding\" cx=\"32.49\" cy=\"-159.20\" r=\"20.00\"/>\n",
+       "                <path d=\"M60.00,0 0,60.00 M52.00,0 60.00,0 60.00,8.00\" transform=\"matrix(-0.61,0.80,-0.80,-0.61,80.59,-172.88)\" class=\"nad-pst-arrow\"/>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"19\" class=\"nad-dangling-line-edge\">\n",
        "            <g id=\"19.1\" class=\"nad-vl300to500-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"609.74,-35.24 851.26,101.66\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(638.01,-19.21)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"231.72,-379.35 504.60,-309.70\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(263.21,-371.31)\">\n",
        "                    <g class=\"nad-active nad-state-in\">\n",
-       "                        <g transform=\"rotate(119.55)\">\n",
+       "                        <g transform=\"rotate(104.32)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(29.55)\" x=\"19.00\">-37</text>\n",
+       "                        <text transform=\"rotate(14.32)\" x=\"19.00\">-37</text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"19.2\" class=\"nad-vl300to500-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"1092.78,238.57 851.26,101.66\"/>\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"777.49,-240.06 504.60,-309.70\"/>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"22\" class=\"nad-dangling-line-edge\">\n",
        "            <g id=\"22.1\" class=\"nad-vl300to500-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"590.02,-75.98 621.23,-277.55\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(594.99,-108.09)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"203.63,-413.61 192.64,-623.02\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(201.93,-446.07)\">\n",
        "                    <g class=\"nad-active nad-state-in\">\n",
-       "                        <g transform=\"rotate(8.80)\">\n",
+       "                        <g transform=\"rotate(-3.00)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-81.20)\" x=\"19.00\">-83</text>\n",
+       "                        <text transform=\"rotate(-273.00)\" x=\"-19.00\" style=\"text-anchor:end\">-83</text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"22.2\" class=\"nad-vl300to500-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"652.44,-479.13 621.23,-277.55\"/>\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"181.65,-832.43 192.64,-623.02\"/>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"25\" class=\"nad-dangling-line-edge\">\n",
        "            <g id=\"25.1\" class=\"nad-vl300to500-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"563.24,-64.51 391.90,-183.74\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(536.56,-83.07)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"180.26,-398.01 1.15,-483.67\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(150.94,-412.03)\">\n",
        "                    <g class=\"nad-active nad-state-in\">\n",
-       "                        <g transform=\"rotate(-55.17)\">\n",
+       "                        <g transform=\"rotate(-64.44)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-325.17)\" x=\"-19.00\" style=\"text-anchor:end\">-37</text>\n",
+       "                        <text transform=\"rotate(-334.44)\" x=\"-19.00\" style=\"text-anchor:end\">-37</text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"25.2\" class=\"nad-vl300to500-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"220.56,-302.96 391.90,-183.74\"/>\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"-177.96,-569.32 1.15,-483.67\"/>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"26\">\n",
        "            <g id=\"26.1\" class=\"nad-vl70to120-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"204.64,299.90 52.90,308.72\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(172.20,301.79)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(-93.33)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"-148.93,69.65 -329.30,223.03\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(-173.69,90.70)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(-130.38)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-3.33)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
+       "                        <text transform=\"rotate(-40.38)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"26.2\" class=\"nad-vl0to30-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"-158.73,321.03 -6.99,312.20\"/>\n",
-       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(-126.29,319.14)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(86.67)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"-555.38,415.28 -375.01,261.89\"/>\n",
+       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(-530.62,394.22)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(49.62)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-3.33)\" x=\"19.00\"></text>\n",
+       "                        <text transform=\"rotate(-40.38)\" x=\"19.00\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g class=\"nad-glued-center\">\n",
-       "                <circle class=\"nad-vl70to120-line nad-winding\" cx=\"32.94\" cy=\"309.88\" r=\"20.00\"/>\n",
-       "                <circle class=\"nad-vl0to30-line nad-winding\" cx=\"12.97\" cy=\"311.04\" r=\"20.00\"/>\n",
+       "                <circle class=\"nad-vl70to120-line nad-winding\" cx=\"-344.53\" cy=\"235.98\" r=\"20.00\"/>\n",
+       "                <circle class=\"nad-vl0to30-line nad-winding\" cx=\"-359.77\" cy=\"248.94\" r=\"20.00\"/>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"27\">\n",
        "            <g id=\"27.1\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"430.60,636.29 353.50,505.02\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(414.14,608.27)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(-30.43)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"161.72,258.39 52.49,180.51\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(135.26,239.52)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(-54.51)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-300.43)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
+       "                        <text transform=\"rotate(-324.51)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"27.2\" class=\"nad-vl70to120-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"246.02,322.02 323.12,453.28\"/>\n",
-       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(262.48,350.04)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(149.57)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"-105.59,67.80 3.64,145.68\"/>\n",
+       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(-79.13,86.66)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(125.49)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(59.57)\" x=\"19.00\"></text>\n",
+       "                        <text transform=\"rotate(35.49)\" x=\"19.00\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g class=\"nad-glued-center\">\n",
-       "                <circle class=\"nad-vl180to300-line nad-winding\" cx=\"343.37\" cy=\"487.78\" r=\"20.00\"/>\n",
-       "                <circle class=\"nad-vl70to120-line nad-winding\" cx=\"333.24\" cy=\"470.53\" r=\"20.00\"/>\n",
+       "                <circle class=\"nad-vl180to300-line nad-winding\" cx=\"36.21\" cy=\"168.90\" r=\"20.00\"/>\n",
+       "                <circle class=\"nad-vl70to120-line nad-winding\" cx=\"19.92\" cy=\"157.29\" r=\"20.00\"/>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"28\">\n",
        "            <g id=\"28.1\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"419.44,671.27 371.55,692.79 264.01,841.86\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(354.00,717.12)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(-144.19)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"156.77,277.30 104.57,282.91 -22.88,375.96\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(80.34,300.60)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(-126.13)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-54.19)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
+       "                        <text transform=\"rotate(-36.13)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"28.2\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"151.15,1043.17 156.47,990.94 264.01,841.86\"/>\n",
-       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(174.02,966.61)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(35.81)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"-171.56,517.03 -150.32,469.02 -22.88,375.96\"/>\n",
+       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(-126.09,451.32)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(53.87)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-54.19)\" x=\"19.00\"></text>\n",
+       "                        <text transform=\"rotate(-36.13)\" x=\"19.00\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"29\">\n",
        "            <g id=\"29.1\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"441.74,687.36 436.43,739.59 328.89,888.67\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(418.88,763.92)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(-144.19)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"172.99,299.51 151.75,347.52 24.30,440.57\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(127.52,365.21)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(-126.13)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-54.19)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
+       "                        <text transform=\"rotate(-36.13)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"29.2\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"173.46,1059.26 221.35,1037.74 328.89,888.67\"/>\n",
-       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(238.90,1013.41)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(35.81)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"-155.35,539.24 -103.15,533.63 24.30,440.57\"/>\n",
+       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(-78.92,515.94)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(53.87)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-54.19)\" x=\"19.00\"></text>\n",
+       "                        <text transform=\"rotate(-36.13)\" x=\"19.00\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"32\" class=\"nad-dangling-line-edge\">\n",
        "            <g id=\"32.1\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"120.90,1071.74 -64.76,1079.93\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(88.43,1073.17)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"-202.08,522.67 -390.99,332.62\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(-224.99,499.62)\">\n",
        "                    <g class=\"nad-active nad-state-in\">\n",
-       "                        <g transform=\"rotate(-92.53)\">\n",
+       "                        <g transform=\"rotate(-44.83)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-2.53)\" x=\"-19.00\" style=\"text-anchor:end\">-26</text>\n",
+       "                        <text transform=\"rotate(-314.83)\" x=\"-19.00\" style=\"text-anchor:end\">-26</text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"32.2\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"-250.41,1088.12 -64.76,1079.93\"/>\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"-579.90,142.58 -390.99,332.62\"/>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"35\" class=\"nad-dangling-line-edge\">\n",
        "            <g id=\"35.1\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"155.26,1097.15 198.54,1264.43\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(163.40,1128.62)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"-181.15,569.63 -170.68,755.93\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(-179.33,602.08)\">\n",
        "                    <g class=\"nad-active nad-state-in\">\n",
-       "                        <g transform=\"rotate(165.49)\">\n",
+       "                        <g transform=\"rotate(176.79)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(75.49)\" x=\"19.00\">-24</text>\n",
+       "                        <text transform=\"rotate(86.79)\" x=\"19.00\">-24</text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"35.2\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"241.82,1431.71 198.54,1264.43\"/>\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"-160.22,942.22 -170.68,755.93\"/>\n",
        "            </g>\n",
        "        </g>\n",
        "    </g>\n",
        "    <g class=\"nad-3wt-edges\">\n",
        "        <g id=\"14\" class=\"nad-vl300to500-line\">\n",
-       "            <polyline class=\"nad-edge-path nad-stretchable\" points=\"599.42,-24.90 755.59,238.97\"/>\n",
-       "            <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(615.98,3.06)\">\n",
-       "                <g class=\"nad-active nad-state-out\">\n",
-       "                    <g transform=\"rotate(149.38)\">\n",
+       "            <polyline class=\"nad-edge-path nad-stretchable\" points=\"224.04,-366.23 437.73,-155.65\"/>\n",
+       "            <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(247.19,-343.42)\">\n",
+       "                <g class=\"nad-active\">\n",
+       "                    <g transform=\"rotate(134.58)\">\n",
        "                        <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                        <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                    </g>\n",
-       "                    <text transform=\"rotate(59.38)\" x=\"19.00\"></text>\n",
+       "                    <text transform=\"rotate(44.58)\" x=\"19.00\"></text>\n",
        "                </g>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"15\" class=\"nad-vl180to300-line\">\n",
-       "            <polyline class=\"nad-edge-path nad-stretchable\" points=\"462.01,638.78 746.45,293.64\"/>\n",
-       "            <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(482.68,613.70)\">\n",
-       "                <g class=\"nad-active nad-state-out\">\n",
-       "                    <g transform=\"rotate(39.49)\">\n",
+       "            <polyline class=\"nad-edge-path nad-stretchable\" points=\"199.38,251.48 434.14,-100.34\"/>\n",
+       "            <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(217.42,224.45)\">\n",
+       "                <g class=\"nad-active\">\n",
+       "                    <g transform=\"rotate(33.71)\">\n",
        "                        <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                        <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                    </g>\n",
-       "                    <text transform=\"rotate(-50.51)\" x=\"19.00\"></text>\n",
+       "                    <text transform=\"rotate(-56.29)\" x=\"19.00\"></text>\n",
        "                </g>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"16\" class=\"nad-vl0to30-line\">\n",
-       "            <polyline class=\"nad-edge-path nad-stretchable\" points=\"1134.33,-90.79 798.36,274.22\"/>\n",
-       "            <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(1112.32,-66.87)\">\n",
-       "                <g class=\"nad-active nad-state-out\">\n",
-       "                    <g transform=\"rotate(-137.37)\">\n",
+       "            <polyline class=\"nad-edge-path nad-stretchable\" points=\"698.88,-563.95 483.83,-124.88\"/>\n",
+       "            <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(684.58,-534.76)\">\n",
+       "                <g class=\"nad-active\">\n",
+       "                    <g transform=\"rotate(-153.91)\">\n",
        "                        <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                        <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                    </g>\n",
-       "                    <text transform=\"rotate(-47.37)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
+       "                    <text transform=\"rotate(-63.91)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
        "                </g>\n",
        "            </g>\n",
        "        </g>\n",
        "    </g>\n",
        "    <g class=\"nad-3wt-nodes\">\n",
-       "        <g id=\"13\" transform=\"translate(766.80,268.94)\">\n",
-       "            <circle class=\"nad-vl300to500-line nad-winding\" cx=\"-4.20\" cy=\"-11.24\" r=\"20.00\"/>\n",
-       "            <circle class=\"nad-vl180to300-line nad-winding\" cx=\"-7.63\" cy=\"9.26\" r=\"20.00\"/>\n",
-       "            <circle class=\"nad-vl0to30-line nad-winding\" cx=\"11.84\" cy=\"1.98\" r=\"20.00\"/>\n",
+       "        <g id=\"13\" transform=\"translate(451.90,-126.96)\">\n",
+       "            <circle class=\"nad-vl300to500-line nad-winding\" cx=\"-5.31\" cy=\"-10.76\" r=\"20.00\"/>\n",
+       "            <circle class=\"nad-vl180to300-line nad-winding\" cx=\"-6.66\" cy=\"9.98\" r=\"20.00\"/>\n",
+       "            <circle class=\"nad-vl0to30-line nad-winding\" cx=\"11.97\" cy=\"0.78\" r=\"20.00\"/>\n",
        "        </g>\n",
        "    </g>\n",
        "    <g class=\"nad-text-edges\">\n",
-       "        <polyline id=\"0-textedge\" points=\"615.48,-53.25 685.81,-63.80\"/>\n",
-       "        <polyline id=\"2-textedge\" points=\"-156.52,318.17 -86.18,307.62\"/>\n",
-       "        <polyline id=\"4-textedge\" points=\"261.76,293.85 332.09,283.30\"/>\n",
-       "        <polyline id=\"6-textedge\" points=\"1183.65,-114.47 1253.98,-125.02\"/>\n",
-       "        <polyline id=\"8-textedge\" points=\"474.19,655.55 544.52,645.00\"/>\n",
-       "        <polyline id=\"10-textedge\" points=\"178.04,1066.08 248.37,1055.53\"/>\n",
+       "        <polyline id=\"0-textedge\" points=\"234.74,-390.60 305.07,-401.15\"/>\n",
+       "        <polyline id=\"2-textedge\" points=\"-546.66,428.64 -476.33,418.09\"/>\n",
+       "        <polyline id=\"4-textedge\" points=\"-98.31,47.38 -27.98,36.83\"/>\n",
+       "        <polyline id=\"6-textedge\" points=\"742.07,-592.34 812.41,-602.89\"/>\n",
+       "        <polyline id=\"8-textedge\" points=\"213.78,269.91 284.11,259.36\"/>\n",
+       "        <polyline id=\"10-textedge\" points=\"-153.02,537.73 -82.69,527.18\"/>\n",
        "    </g>\n",
        "    <g class=\"nad-text-nodes\">\n",
-       "        <foreignObject id=\"0-textnode\" y=\"-88.80\" x=\"685.81\" height=\"1\" width=\"1\">\n",
+       "        <foreignObject id=\"0-textnode\" y=\"-426.15\" x=\"305.07\" height=\"1\" width=\"1\">\n",
        "            <div xmlns=\"http://www.w3.org/1999/xhtml\" class=\"nad-label-box\">\n",
        "                <div>380.0</div>\n",
        "                <table>\n",
@@ -1006,7 +920,7 @@
        "                </table>\n",
        "            </div>\n",
        "        </foreignObject>\n",
-       "        <foreignObject id=\"2-textnode\" y=\"282.62\" x=\"-86.18\" height=\"1\" width=\"1\">\n",
+       "        <foreignObject id=\"2-textnode\" y=\"393.09\" x=\"-476.33\" height=\"1\" width=\"1\">\n",
        "            <div xmlns=\"http://www.w3.org/1999/xhtml\" class=\"nad-label-box\">\n",
        "                <div>10.5</div>\n",
        "                <table>\n",
@@ -1019,7 +933,7 @@
        "                </table>\n",
        "            </div>\n",
        "        </foreignObject>\n",
-       "        <foreignObject id=\"4-textnode\" y=\"258.30\" x=\"332.09\" height=\"1\" width=\"1\">\n",
+       "        <foreignObject id=\"4-textnode\" y=\"11.83\" x=\"-27.98\" height=\"1\" width=\"1\">\n",
        "            <div xmlns=\"http://www.w3.org/1999/xhtml\" class=\"nad-label-box\">\n",
        "                <div>110.0</div>\n",
        "                <table>\n",
@@ -1032,7 +946,7 @@
        "                </table>\n",
        "            </div>\n",
        "        </foreignObject>\n",
-       "        <foreignObject id=\"6-textnode\" y=\"-150.02\" x=\"1253.98\" height=\"1\" width=\"1\">\n",
+       "        <foreignObject id=\"6-textnode\" y=\"-627.89\" x=\"812.41\" height=\"1\" width=\"1\">\n",
        "            <div xmlns=\"http://www.w3.org/1999/xhtml\" class=\"nad-label-box\">\n",
        "                <div>21.0</div>\n",
        "                <table>\n",
@@ -1045,7 +959,7 @@
        "                </table>\n",
        "            </div>\n",
        "        </foreignObject>\n",
-       "        <foreignObject id=\"8-textnode\" y=\"620.00\" x=\"544.52\" height=\"1\" width=\"1\">\n",
+       "        <foreignObject id=\"8-textnode\" y=\"234.36\" x=\"284.11\" height=\"1\" width=\"1\">\n",
        "            <div xmlns=\"http://www.w3.org/1999/xhtml\" class=\"nad-label-box\">\n",
        "                <div>225.0</div>\n",
        "                <table>\n",
@@ -1058,7 +972,7 @@
        "                </table>\n",
        "            </div>\n",
        "        </foreignObject>\n",
-       "        <foreignObject id=\"10-textnode\" y=\"1030.53\" x=\"248.37\" height=\"1\" width=\"1\">\n",
+       "        <foreignObject id=\"10-textnode\" y=\"502.18\" x=\"-82.69\" height=\"1\" width=\"1\">\n",
        "            <div xmlns=\"http://www.w3.org/1999/xhtml\" class=\"nad-label-box\">\n",
        "                <div>220.0</div>\n",
        "                <table>\n",
@@ -1075,7 +989,7 @@
        "</svg>\n"
       ],
       "text/plain": [
-       "<pypowsybl.network.impl.svg.Svg at 0x7f8a549f2f70>"
+       "<pypowsybl.network.impl.svg.Svg at 0x7855a3926350>"
       ]
      },
      "execution_count": 5,
@@ -1254,7 +1168,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 14,
+   "execution_count": 8,
    "metadata": {},
    "outputs": [
     {
@@ -1320,7 +1234,7 @@
        "ed0c5d75-4a54-43c8-b782-b20d7431630b  TN_Border_MA11"
       ]
      },
-     "execution_count": 14,
+     "execution_count": 8,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -1331,7 +1245,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 15,
+   "execution_count": 9,
    "metadata": {},
    "outputs": [
     {
@@ -1397,7 +1311,7 @@
        "dad02278-bd25-476f-8f58-dbe44be72586  TN_Border_MA11"
       ]
      },
-     "execution_count": 15,
+     "execution_count": 9,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -1419,7 +1333,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 16,
+   "execution_count": 10,
    "metadata": {
     "pycharm": {
      "name": "#%%\n"
@@ -1444,7 +1358,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 17,
+   "execution_count": 11,
    "metadata": {
     "pycharm": {
      "name": "#%%\n"
@@ -1525,7 +1439,7 @@
        "c49942d6-8b01-4b01-b5e8-f1180f84906c      NL  "
       ]
      },
-     "execution_count": 17,
+     "execution_count": 11,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -1547,7 +1461,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 18,
+   "execution_count": 12,
    "metadata": {
     "pycharm": {
      "name": "#%%\n"
@@ -1558,7 +1472,7 @@
      "data": {
       "image/svg+xml": [
        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n",
-       "<svg width=\"654.32\" height=\"600.00\" viewBox=\"-799.98 -733.60 2379.85 2182.28\" xmlns=\"http://www.w3.org/2000/svg\">\n",
+       "<svg width=\"665.35\" height=\"600.00\" viewBox=\"-1164.54 -1127.06 2372.37 2139.37\" xmlns=\"http://www.w3.org/2000/svg\">\n",
        "    <style><![CDATA[\n",
        ".nad-branch-edges .nad-edge-path, .nad-3wt-edges .nad-edge-path {stroke: var(--nad-vl-color, lightgrey); stroke-width: 5; fill: none}\n",
        ".nad-branch-edges .nad-winding, .nad-3wt-nodes .nad-winding {stroke: var(--nad-vl-color, lightgrey); stroke-width: 5; fill: none}\n",
@@ -1569,19 +1483,17 @@
        ".nad-hvdc-edge polyline.nad-hvdc {stroke: grey; stroke-width: 40}\n",
        ".nad-branch-edges .nad-tie-line-edge .nad-edge-path {stroke-width: 7}\n",
        ".nad-pst-arrow {stroke: #6a6a6a; stroke-width: 4; stroke-linecap: round; fill: none}\n",
-       ".nad-state-out .nad-arrow-in {visibility: hidden}\n",
-       ".nad-state-in .nad-arrow-out {visibility: hidden}\n",
-       ".nad-active path {stroke: none; fill: #546e7a}\n",
-       ".nad-reactive path {stroke: none; fill: #0277bd}\n",
-       ".nad-current path {stroke: none; fill: #bd4802}\n",
+       "path.nad-arrow-out:not(.nad-state-out .nad-arrow-out) {visibility: hidden}\n",
+       "path.nad-arrow-in:not(.nad-state-in .nad-arrow-in) {visibility: hidden}\n",
+       ".nad-active {fill: #546e7a}\n",
+       ".nad-reactive {fill: #0277bd}\n",
+       ".nad-current {fill: #bd4802}\n",
        ".nad-text-background {flood-color: #90a4aeaa}\n",
        ".nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central}\n",
        ".nad-text-nodes foreignObject {overflow: visible; color: black}\n",
        ".nad-label-box {background-color: #6c6c6c20; width: max-content; padding: 10px; border-radius: 10px;}\n",
        ".nad-legend-square {width: 20px; height: 20px; background: var(--nad-vl-color, black);}\n",
        ".nad-edge-infos text, .nad-edge-label text {font: 20px serif; dominant-baseline:middle; stroke: #FFFFFFAA; stroke-width: 10; stroke-linejoin:round; paint-order: stroke}\n",
-       ".nad-edge-infos .nad-state-in text {fill: #b71c1c}\n",
-       ".nad-edge-infos .nad-state-out text {fill: #2e7d32}\n",
        ".nad-disconnected {--nad-vl-color: #808080}\n",
        ".nad-vl0to30-line {--nad-vl-color: #afb42b}\n",
        ".nad-vl0to30-0 {--nad-vl-color: #827717}\n",
@@ -1670,169 +1582,122 @@
        "  40% {stroke: #00BCD4; stroke-width: 15}\n",
        "}\n",
        "]]></style>\n",
-       "    <metadata>\n",
-       "        <nad:nad xmlns:nad=\"http://www.powsybl.org/schema/nad-metadata/1_0\">\n",
-       "            <nad:busNodes>\n",
-       "                <nad:busNode svgId=\"1\" equipmentId=\"2a37dc57-2faf-464a-8175-bc415f9a635f_0\"/>\n",
-       "                <nad:busNode svgId=\"3\" equipmentId=\"469df5f7-058f-4451-a998-57a48e8a56fe_0\"/>\n",
-       "                <nad:busNode svgId=\"5\" equipmentId=\"4ba71b59-ee2f-450b-9f7d-cc2f1cc5e386_0\"/>\n",
-       "                <nad:busNode svgId=\"7\" equipmentId=\"8bbd7e74-ae20-4dce-8780-c20f8e18c2e0_0\"/>\n",
-       "                <nad:busNode svgId=\"9\" equipmentId=\"8d8a82ba-b5b0-4e94-861a-192af055f2b8_0\"/>\n",
-       "                <nad:busNode svgId=\"11\" equipmentId=\"929ba893-c9dc-44d7-b1fd-30834bd3ab85_0\"/>\n",
-       "                <nad:busNode svgId=\"13\" equipmentId=\"b10b171b-3bc5-4849-bb1f-61ed9ea1ec7c_0\"/>\n",
-       "                <nad:busNode svgId=\"15\" equipmentId=\"c1d5bfde8f8011e08e4d00247eb1f55e_0\"/>\n",
-       "                <nad:busNode svgId=\"17\" equipmentId=\"c1d5bfea8f8011e08e4d00247eb1f55e_0\"/>\n",
-       "                <nad:busNode svgId=\"19\" equipmentId=\"d0486169-2205-40b2-895e-b672ecb9e5fc_0\"/>\n",
-       "            </nad:busNodes>\n",
-       "            <nad:nodes>\n",
-       "                <nad:node svgId=\"0\" equipmentId=\"2a37dc57-2faf-464a-8175-bc415f9a635f\" x=\"940.61\" y=\"-518.60\"/>\n",
-       "                <nad:node svgId=\"2\" equipmentId=\"469df5f7-058f-4451-a998-57a48e8a56fe\" x=\"99.18\" y=\"287.83\"/>\n",
-       "                <nad:node svgId=\"4\" equipmentId=\"4ba71b59-ee2f-450b-9f7d-cc2f1cc5e386\" x=\"414.36\" y=\"1248.69\"/>\n",
-       "                <nad:node svgId=\"6\" equipmentId=\"8bbd7e74-ae20-4dce-8780-c20f8e18c2e0\" x=\"238.94\" y=\"860.06\"/>\n",
-       "                <nad:node svgId=\"8\" equipmentId=\"8d8a82ba-b5b0-4e94-861a-192af055f2b8\" x=\"1279.88\" y=\"-21.74\"/>\n",
-       "                <nad:node svgId=\"10\" equipmentId=\"929ba893-c9dc-44d7-b1fd-30834bd3ab85\" x=\"-599.98\" y=\"503.08\"/>\n",
-       "                <nad:node svgId=\"12\" equipmentId=\"b10b171b-3bc5-4849-bb1f-61ed9ea1ec7c\" x=\"344.46\" y=\"559.65\"/>\n",
-       "                <nad:node svgId=\"14\" equipmentId=\"c1d5bfde8f8011e08e4d00247eb1f55e\" x=\"379.83\" y=\"-96.29\"/>\n",
-       "                <nad:node svgId=\"16\" equipmentId=\"c1d5bfea8f8011e08e4d00247eb1f55e\" x=\"852.14\" y=\"-102.23\"/>\n",
-       "                <nad:node svgId=\"18\" equipmentId=\"d0486169-2205-40b2-895e-b672ecb9e5fc\" x=\"740.84\" y=\"331.31\"/>\n",
-       "                <nad:node svgId=\"22\" equipmentId=\"84ed55f4-61f5-4d9d-8755-bba7b877a246\" x=\"-182.39\" y=\"493.22\"/>\n",
-       "            </nad:nodes>\n",
-       "            <nad:edges>\n",
-       "                <nad:edge svgId=\"20\" equipmentId=\"2184f365-8cd5-4b5d-8a28-9d68603bb6a4\" node1=\"16\" node2=\"0\"/>\n",
-       "                <nad:edge svgId=\"21\" equipmentId=\"a708c3bc-465d-4fe7-b6ef-6fa6408a62b0\" node1=\"2\" node2=\"6\"/>\n",
-       "                <nad:edge svgId=\"26\" equipmentId=\"78736387-5f60-4832-b3fe-d50daf81b0a6 + 7f43f508-2496-4b64-9146-0a40406cbe49\" node1=\"2\" node2=\"14\"/>\n",
-       "                <nad:edge svgId=\"27\" equipmentId=\"b18cd1aa-7808-49b9-a7cf-605eaf07b006 + e8acf6b6-99cb-45ad-b8dc-16c7866a4ddc\" node1=\"2\" node2=\"14\"/>\n",
-       "                <nad:edge svgId=\"28\" equipmentId=\"dad02278-bd25-476f-8f58-dbe44be72586 + ed0c5d75-4a54-43c8-b782-b20d7431630b\" node1=\"14\" node2=\"2\"/>\n",
-       "                <nad:edge svgId=\"29\" equipmentId=\"e482b89a-fa84-4ea9-8e70-a83d44790957\" node1=\"6\" node2=\"4\"/>\n",
-       "                <nad:edge svgId=\"30\" equipmentId=\"b94318f6-6d24-4f56-96b9-df2531ad6543\" node1=\"12\" node2=\"6\"/>\n",
-       "                <nad:edge svgId=\"31\" equipmentId=\"80016742-31b3-432a-b00a-300667a1e572\" node1=\"16\" node2=\"8\"/>\n",
-       "                <nad:edge svgId=\"32\" equipmentId=\"b58bf21a-096a-4dae-9a01-3f03b60c24c7\" node1=\"12\" node2=\"18\"/>\n",
-       "                <nad:edge svgId=\"33\" equipmentId=\"ffbabc27-1ccd-4fdc-b037-e341706c8d29\" node1=\"12\" node2=\"18\"/>\n",
-       "                <nad:edge svgId=\"34\" equipmentId=\"e8a7eaec-51d6-4571-b3d9-c36d52073c33\" node1=\"14\" node2=\"16\"/>\n",
-       "                <nad:edge svgId=\"35\" equipmentId=\"17086487-56ba-4979-b8de-064025a6b4da + 8fdc7abd-3746-481a-a65e-3df56acd8b13\" node1=\"18\" node2=\"16\"/>\n",
-       "                <nad:edge svgId=\"36\" equipmentId=\"a16b4a6c-70b1-4abf-9a9d-bd0fa47f9fe4 + a279a3dc-550b-426c-af3a-61b7be508dcc\" node1=\"18\" node2=\"16\"/>\n",
-       "                <nad:edge svgId=\"23\" equipmentId=\"84ed55f4-61f5-4d9d-8755-bba7b877a246\" node1=\"2\" node2=\"22\"/>\n",
-       "                <nad:edge svgId=\"24\" equipmentId=\"84ed55f4-61f5-4d9d-8755-bba7b877a246\" node1=\"12\" node2=\"22\"/>\n",
-       "                <nad:edge svgId=\"25\" equipmentId=\"84ed55f4-61f5-4d9d-8755-bba7b877a246\" node1=\"10\" node2=\"22\"/>\n",
-       "            </nad:edges>\n",
-       "        </nad:nad>\n",
-       "    </metadata>\n",
        "    <g class=\"nad-vl-nodes\">\n",
-       "        <g transform=\"translate(940.61,-518.60)\" id=\"0\">\n",
+       "        <g transform=\"translate(559.24,-887.06)\" id=\"0\">\n",
        "            <circle r=\"27.50\" id=\"1\" class=\"nad-vl0to30-0 nad-busnode\"/>\n",
        "        </g>\n",
-       "        <g transform=\"translate(99.18,287.83)\" id=\"2\">\n",
+       "        <g transform=\"translate(-223.18,-152.54)\" id=\"2\">\n",
        "            <circle r=\"27.50\" id=\"3\" class=\"nad-vl300to500-0 nad-busnode\"/>\n",
        "        </g>\n",
-       "        <g transform=\"translate(414.36,1248.69)\" id=\"4\">\n",
+       "        <g transform=\"translate(169.02,812.31)\" id=\"4\">\n",
        "            <circle r=\"27.50\" id=\"5\" class=\"nad-vl0to30-0 nad-busnode\"/>\n",
        "        </g>\n",
-       "        <g transform=\"translate(238.94,860.06)\" id=\"6\">\n",
+       "        <g transform=\"translate(-4.58,432.60)\" id=\"6\">\n",
        "            <circle r=\"27.50\" id=\"7\" class=\"nad-vl70to120-0 nad-busnode\"/>\n",
        "        </g>\n",
-       "        <g transform=\"translate(1279.88,-21.74)\" id=\"8\">\n",
+       "        <g transform=\"translate(907.83,-306.91)\" id=\"8\">\n",
        "            <circle r=\"27.50\" id=\"9\" class=\"nad-vl0to30-0 nad-busnode\"/>\n",
        "        </g>\n",
-       "        <g transform=\"translate(-599.98,503.08)\" id=\"10\">\n",
+       "        <g transform=\"translate(-964.54,149.22)\" id=\"10\">\n",
        "            <circle r=\"27.50\" id=\"11\" class=\"nad-vl0to30-0 nad-busnode\"/>\n",
        "        </g>\n",
-       "        <g transform=\"translate(344.46,559.65)\" id=\"12\">\n",
+       "        <g transform=\"translate(-153.65,175.47)\" id=\"12\">\n",
        "            <circle r=\"27.50\" id=\"13\" class=\"nad-vl180to300-0 nad-busnode\"/>\n",
        "        </g>\n",
-       "        <g transform=\"translate(379.83,-96.29)\" id=\"14\">\n",
+       "        <g transform=\"translate(49.18,-516.55)\" id=\"14\">\n",
        "            <circle r=\"27.50\" id=\"15\" class=\"nad-vl300to500-0 nad-busnode\"/>\n",
        "        </g>\n",
-       "        <g transform=\"translate(852.14,-102.23)\" id=\"16\">\n",
+       "        <g transform=\"translate(497.30,-461.83)\" id=\"16\">\n",
        "            <circle r=\"27.50\" id=\"17\" class=\"nad-vl180to300-0 nad-busnode\"/>\n",
        "        </g>\n",
-       "        <g transform=\"translate(740.84,331.31)\" id=\"18\">\n",
+       "        <g transform=\"translate(302.18,-49.36)\" id=\"18\">\n",
        "            <circle r=\"27.50\" id=\"19\" class=\"nad-vl180to300-0 nad-busnode\"/>\n",
        "        </g>\n",
        "    </g>\n",
        "    <g class=\"nad-branch-edges\">\n",
        "        <g id=\"20\">\n",
        "            <g id=\"20.1\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"857.86,-129.13 890.14,-281.07\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(864.61,-160.92)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(12.00)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"501.26,-489.04 523.94,-644.76\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(505.95,-521.20)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(8.29)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-78.00)\" x=\"19.00\"></text>\n",
+       "                        <text transform=\"rotate(-81.71)\" x=\"19.00\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"20.2\" class=\"nad-vl0to30-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"934.90,-491.70 902.61,-339.76\"/>\n",
-       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(928.14,-459.91)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(-168.00)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"555.27,-859.85 532.59,-704.13\"/>\n",
+       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(550.59,-827.69)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(-171.71)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-78.00)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
+       "                        <text transform=\"rotate(-81.71)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g class=\"nad-glued-center\">\n",
-       "                <circle class=\"nad-vl180to300-line nad-winding\" cx=\"894.30\" cy=\"-300.63\" r=\"20.00\"/>\n",
-       "                <circle class=\"nad-vl0to30-line nad-winding\" cx=\"898.46\" cy=\"-320.20\" r=\"20.00\"/>\n",
+       "                <circle class=\"nad-vl180to300-line nad-winding\" cx=\"526.83\" cy=\"-664.55\" r=\"20.00\"/>\n",
+       "                <circle class=\"nad-vl0to30-line nad-winding\" cx=\"529.71\" cy=\"-684.34\" r=\"20.00\"/>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"21\">\n",
        "            <g id=\"21.1\" class=\"nad-vl300to500-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"105.71,314.55 161.94,544.80\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(113.42,346.12)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(166.28)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"-213.55,-126.78 -124.38,111.93\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(-202.18,-96.34)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(159.52)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(76.28)\" x=\"19.00\"></text>\n",
+       "                        <text transform=\"rotate(69.52)\" x=\"19.00\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"21.2\" class=\"nad-vl70to120-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"232.41,833.34 176.18,603.09\"/>\n",
-       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(224.70,801.77)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(-13.72)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"-14.20,406.84 -103.38,168.13\"/>\n",
+       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(-25.58,376.40)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(-20.48)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-283.72)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
+       "                        <text transform=\"rotate(-290.48)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g class=\"nad-glued-center\">\n",
-       "                <circle class=\"nad-vl300to500-line nad-winding\" cx=\"166.69\" cy=\"564.23\" r=\"20.00\"/>\n",
-       "                <circle class=\"nad-vl70to120-line nad-winding\" cx=\"171.43\" cy=\"583.66\" r=\"20.00\"/>\n",
-       "                <path d=\"M60.00,0 0,60.00 M52.00,0 60.00,0 60.00,8.00\" transform=\"matrix(0.24,0.97,-0.97,0.24,191.08,537.69)\" class=\"nad-pst-arrow\"/>\n",
+       "                <circle class=\"nad-vl300to500-line nad-winding\" cx=\"-117.38\" cy=\"130.66\" r=\"20.00\"/>\n",
+       "                <circle class=\"nad-vl70to120-line nad-winding\" cx=\"-110.38\" cy=\"149.40\" r=\"20.00\"/>\n",
+       "                <path d=\"M60.00,0 0,60.00 M52.00,0 60.00,0 60.00,8.00\" transform=\"matrix(0.35,0.94,-0.94,0.35,-96.27,101.43)\" class=\"nad-pst-arrow\"/>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"26\" class=\"nad-tie-line-edge\">\n",
        "            <g id=\"26.1\" class=\"nad-vl300to500-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"124.33,276.71 172.35,255.49 271.80,119.37\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(190.05,231.26)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"-197.90,-163.38 -149.64,-184.05 -54.97,-310.58\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(-131.67,-208.07)\">\n",
        "                    <g class=\"nad-active nad-state-in\">\n",
-       "                        <g transform=\"rotate(36.15)\">\n",
+       "                        <g transform=\"rotate(36.80)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-53.85)\" x=\"19.00\">-37</text>\n",
+       "                        <text transform=\"rotate(-53.20)\" x=\"19.00\">-37</text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"26.2\" class=\"nad-vl300to500-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"376.88,-68.95 371.25,-16.76 271.80,119.37\"/>\n",
-       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(353.56,7.47)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"45.92,-489.24 39.70,-437.11 -54.97,-310.58\"/>\n",
+       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(21.73,-413.09)\">\n",
        "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(-143.85)\">\n",
+       "                        <g transform=\"rotate(-143.20)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-53.85)\" x=\"-19.00\" style=\"text-anchor:end\">52</text>\n",
+       "                        <text transform=\"rotate(-53.20)\" x=\"-19.00\" style=\"text-anchor:end\">52</text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
@@ -1840,26 +1705,26 @@
        "        </g>\n",
        "        <g id=\"27\" class=\"nad-tie-line-edge\">\n",
        "            <g id=\"27.1\" class=\"nad-vl300to500-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"115.40,265.63 239.50,95.77\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(134.58,239.39)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"-206.70,-174.56 -87.00,-334.55\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(-187.23,-200.59)\">\n",
        "                    <g class=\"nad-active nad-state-in\">\n",
-       "                        <g transform=\"rotate(36.15)\">\n",
+       "                        <g transform=\"rotate(36.80)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-53.85)\" x=\"19.00\">-83</text>\n",
+       "                        <text transform=\"rotate(-53.20)\" x=\"19.00\">-83</text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"27.2\" class=\"nad-vl300to500-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"363.60,-74.09 239.50,95.77\"/>\n",
-       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(344.43,-47.85)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"32.70,-494.53 -87.00,-334.55\"/>\n",
+       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(13.23,-468.51)\">\n",
        "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(-143.85)\">\n",
+       "                        <g transform=\"rotate(-143.20)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-53.85)\" x=\"-19.00\" style=\"text-anchor:end\">96</text>\n",
+       "                        <text transform=\"rotate(-53.20)\" x=\"-19.00\" style=\"text-anchor:end\">96</text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
@@ -1867,26 +1732,26 @@
        "        </g>\n",
        "        <g id=\"28\" class=\"nad-tie-line-edge\">\n",
        "            <g id=\"28.1\" class=\"nad-vl300to500-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"354.67,-85.18 306.66,-63.95 207.21,72.17\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(288.96,-39.73)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"23.90,-505.72 -24.36,-485.04 -119.03,-358.51\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(-42.33,-461.02)\">\n",
        "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(-143.85)\">\n",
+       "                        <g transform=\"rotate(-143.20)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-53.85)\" x=\"-19.00\" style=\"text-anchor:end\">51</text>\n",
+       "                        <text transform=\"rotate(-53.20)\" x=\"-19.00\" style=\"text-anchor:end\">51</text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"28.2\" class=\"nad-vl300to500-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"102.13,260.49 107.75,208.29 207.21,72.17\"/>\n",
-       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(125.45,184.07)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"-219.92,-179.85 -213.70,-231.98 -119.03,-358.51\"/>\n",
+       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(-195.73,-256.00)\">\n",
        "                    <g class=\"nad-active nad-state-in\">\n",
-       "                        <g transform=\"rotate(36.15)\">\n",
+       "                        <g transform=\"rotate(36.80)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-53.85)\" x=\"19.00\">-37</text>\n",
+       "                        <text transform=\"rotate(-53.20)\" x=\"19.00\">-37</text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
@@ -1894,198 +1759,198 @@
        "        </g>\n",
        "        <g id=\"29\">\n",
        "            <g id=\"29.1\" class=\"nad-vl70to120-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"250.25,885.12 314.30,1027.03\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(263.62,914.75)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(155.71)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"6.86,457.61 69.75,595.17\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(20.37,487.17)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(155.43)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(65.71)\" x=\"19.00\"></text>\n",
+       "                        <text transform=\"rotate(65.43)\" x=\"19.00\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"29.2\" class=\"nad-vl0to30-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"403.04,1223.62 338.99,1081.72\"/>\n",
-       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(389.67,1194.00)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(-24.29)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"157.58,787.30 94.69,649.74\"/>\n",
+       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(144.07,757.74)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(-24.57)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-294.29)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
+       "                        <text transform=\"rotate(-294.57)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g class=\"nad-glued-center\">\n",
-       "                <circle class=\"nad-vl70to120-line nad-winding\" cx=\"322.53\" cy=\"1045.26\" r=\"20.00\"/>\n",
-       "                <circle class=\"nad-vl0to30-line nad-winding\" cx=\"330.76\" cy=\"1063.49\" r=\"20.00\"/>\n",
+       "                <circle class=\"nad-vl70to120-line nad-winding\" cx=\"78.06\" cy=\"613.36\" r=\"20.00\"/>\n",
+       "                <circle class=\"nad-vl0to30-line nad-winding\" cx=\"86.38\" cy=\"631.55\" r=\"20.00\"/>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"30\">\n",
        "            <g id=\"30.1\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"335.35,585.60 301.64,681.55\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(324.58,616.26)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(-160.64)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"-139.86,199.26 -94.16,278.08\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(-123.56,227.38)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(149.90)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-70.64)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
+       "                        <text transform=\"rotate(59.90)\" x=\"19.00\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"30.2\" class=\"nad-vl70to120-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"248.05,834.11 281.76,738.16\"/>\n",
-       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(258.82,803.45)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(19.36)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"-18.37,408.81 -64.07,329.99\"/>\n",
+       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(-34.67,380.70)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(-30.10)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-70.64)\" x=\"19.00\"></text>\n",
+       "                        <text transform=\"rotate(-300.10)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g class=\"nad-glued-center\">\n",
-       "                <circle class=\"nad-vl180to300-line nad-winding\" cx=\"295.01\" cy=\"700.42\" r=\"20.00\"/>\n",
-       "                <circle class=\"nad-vl70to120-line nad-winding\" cx=\"288.38\" cy=\"719.29\" r=\"20.00\"/>\n",
+       "                <circle class=\"nad-vl180to300-line nad-winding\" cx=\"-84.13\" cy=\"295.39\" r=\"20.00\"/>\n",
+       "                <circle class=\"nad-vl70to120-line nad-winding\" cx=\"-74.10\" cy=\"312.69\" r=\"20.00\"/>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"31\">\n",
        "            <g id=\"31.1\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"879.17,-97.15 1036.53,-67.53\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(911.11,-91.14)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(100.66)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"523.03,-452.12 674.50,-394.96\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(553.44,-440.65)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(110.67)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(10.66)\" x=\"19.00\"></text>\n",
+       "                        <text transform=\"rotate(20.67)\" x=\"19.00\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"31.2\" class=\"nad-vl0to30-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"1252.85,-26.82 1095.49,-56.44\"/>\n",
-       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(1220.91,-32.83)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(-79.34)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"882.10,-316.62 730.63,-373.78\"/>\n",
+       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(851.70,-328.09)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(-69.33)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-349.34)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
+       "                        <text transform=\"rotate(-339.33)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g class=\"nad-glued-center\">\n",
-       "                <circle class=\"nad-vl180to300-line nad-winding\" cx=\"1056.18\" cy=\"-63.83\" r=\"20.00\"/>\n",
-       "                <circle class=\"nad-vl0to30-line nad-winding\" cx=\"1075.84\" cy=\"-60.13\" r=\"20.00\"/>\n",
+       "                <circle class=\"nad-vl180to300-line nad-winding\" cx=\"693.21\" cy=\"-387.90\" r=\"20.00\"/>\n",
+       "                <circle class=\"nad-vl0to30-line nad-winding\" cx=\"711.92\" cy=\"-380.84\" r=\"20.00\"/>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"32\">\n",
        "            <g id=\"32.1\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"371.96,559.68 424.46,559.73 562.62,480.14\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(450.46,544.75)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(60.05)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"-126.21,177.27 -73.83,180.70 91.96,98.93\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(-46.92,167.43)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(63.75)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-29.95)\" x=\"19.00\"></text>\n",
+       "                        <text transform=\"rotate(-26.25)\" x=\"19.00\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"32.2\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"727.06,355.11 700.77,400.55 562.62,480.14\"/>\n",
-       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(674.77,415.52)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(-119.95)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"286.91,-26.50 257.74,17.16 91.96,98.93\"/>\n",
+       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(230.84,30.43)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(-116.25)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-29.95)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
+       "                        <text transform=\"rotate(-26.25)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"33\">\n",
        "            <g id=\"33.1\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"358.23,535.85 384.53,490.41 522.68,410.82\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(410.52,475.43)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(60.05)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"-138.38,152.61 -109.21,108.95 56.57,27.18\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(-82.31,95.68)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(63.75)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-29.95)\" x=\"19.00\"></text>\n",
+       "                        <text transform=\"rotate(-26.25)\" x=\"19.00\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"33.2\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"713.34,331.28 660.84,331.23 522.68,410.82\"/>\n",
-       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(634.84,346.20)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(-119.95)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"274.74,-51.16 222.35,-54.59 56.57,27.18\"/>\n",
+       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(195.45,-41.32)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(-116.25)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-29.95)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
+       "                        <text transform=\"rotate(-26.25)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"34\">\n",
        "            <g id=\"34.1\" class=\"nad-vl300to500-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"407.32,-96.64 585.99,-98.89\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(439.82,-97.05)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(89.28)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"76.47,-513.22 243.46,-492.83\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(108.73,-509.28)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(96.96)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-0.72)\" x=\"19.00\"></text>\n",
+       "                        <text transform=\"rotate(6.96)\" x=\"19.00\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"34.2\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"824.64,-101.89 645.98,-99.64\"/>\n",
-       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(792.15,-101.48)\">\n",
-       "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(-90.72)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"470.00,-465.16 303.02,-485.55\"/>\n",
+       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(437.74,-469.10)\">\n",
+       "                    <g class=\"nad-active\">\n",
+       "                        <g transform=\"rotate(-83.04)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-0.72)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
+       "                        <text transform=\"rotate(-353.04)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g class=\"nad-glued-center\">\n",
-       "                <circle class=\"nad-vl300to500-line nad-winding\" cx=\"605.98\" cy=\"-99.14\" r=\"20.00\"/>\n",
-       "                <circle class=\"nad-vl180to300-line nad-winding\" cx=\"625.98\" cy=\"-99.39\" r=\"20.00\"/>\n",
+       "                <circle class=\"nad-vl300to500-line nad-winding\" cx=\"263.31\" cy=\"-490.40\" r=\"20.00\"/>\n",
+       "                <circle class=\"nad-vl180to300-line nad-winding\" cx=\"283.16\" cy=\"-487.98\" r=\"20.00\"/>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"35\" class=\"nad-tie-line-edge\">\n",
        "            <g id=\"35.1\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"760.08,311.66 796.81,274.15 835.23,124.48\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(804.27,245.09)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"324.80,-65.01 367.97,-94.89 435.90,-238.49\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(380.80,-122.01)\">\n",
        "                    <g class=\"nad-active nad-state-in\">\n",
-       "                        <g transform=\"rotate(14.40)\">\n",
+       "                        <g transform=\"rotate(25.32)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-75.60)\" x=\"19.00\">-26</text>\n",
+       "                        <text transform=\"rotate(-64.68)\" x=\"19.00\">-26</text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"35.2\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"859.54,-75.75 873.66,-25.18 835.23,124.48\"/>\n",
-       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(866.20,3.88)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"499.55,-434.42 503.83,-382.10 435.90,-238.49\"/>\n",
+       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(491.00,-354.98)\">\n",
        "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(-165.60)\">\n",
+       "                        <g transform=\"rotate(-154.68)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-75.60)\" x=\"-19.00\" style=\"text-anchor:end\">29</text>\n",
+       "                        <text transform=\"rotate(-64.68)\" x=\"-19.00\" style=\"text-anchor:end\">29</text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
@@ -2093,26 +1958,26 @@
        "        </g>\n",
        "        <g id=\"36\" class=\"nad-tie-line-edge\">\n",
        "            <g id=\"36.1\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"733.44,304.82 719.32,254.25 757.74,104.59\"/>\n",
-       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(726.78,225.19)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-1\" points=\"299.94,-76.77 295.65,-129.10 363.58,-272.70\"/>\n",
+       "                <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(308.48,-156.22)\">\n",
        "                    <g class=\"nad-active nad-state-in\">\n",
-       "                        <g transform=\"rotate(14.40)\">\n",
+       "                        <g transform=\"rotate(25.32)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-75.60)\" x=\"19.00\">-24</text>\n",
+       "                        <text transform=\"rotate(-64.68)\" x=\"19.00\">-24</text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
        "            <g id=\"36.2\" class=\"nad-vl180to300-line\">\n",
-       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"832.90,-82.58 796.17,-45.07 757.74,104.59\"/>\n",
-       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(788.71,-16.02)\">\n",
+       "                <polyline class=\"nad-edge-path nad-stretchable nad-glued-2\" points=\"474.69,-446.18 431.52,-416.31 363.58,-272.70\"/>\n",
+       "                <g class=\"nad-glued-2 nad-edge-infos\" transform=\"translate(418.69,-389.19)\">\n",
        "                    <g class=\"nad-active nad-state-out\">\n",
-       "                        <g transform=\"rotate(-165.60)\">\n",
+       "                        <g transform=\"rotate(-154.68)\">\n",
        "                            <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                            <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                        </g>\n",
-       "                        <text transform=\"rotate(-75.60)\" x=\"-19.00\" style=\"text-anchor:end\">28</text>\n",
+       "                        <text transform=\"rotate(-64.68)\" x=\"-19.00\" style=\"text-anchor:end\">28</text>\n",
        "                    </g>\n",
        "                </g>\n",
        "            </g>\n",
@@ -2121,63 +1986,63 @@
        "    </g>\n",
        "    <g class=\"nad-3wt-edges\">\n",
        "        <g id=\"23\" class=\"nad-vl300to500-line\">\n",
-       "            <polyline class=\"nad-edge-path nad-stretchable\" points=\"76.96,304.04 -167.05,465.14\"/>\n",
-       "            <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(49.84,321.95)\">\n",
-       "                <g class=\"nad-active nad-state-out\">\n",
-       "                    <g transform=\"rotate(-123.43)\">\n",
+       "            <polyline class=\"nad-edge-path nad-stretchable\" points=\"-247.14,-139.06 -564.05,12.97\"/>\n",
+       "            <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(-276.45,-125.00)\">\n",
+       "                <g class=\"nad-active\">\n",
+       "                    <g transform=\"rotate(-115.63)\">\n",
        "                        <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                        <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                    </g>\n",
-       "                    <text transform=\"rotate(-33.43)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
+       "                    <text transform=\"rotate(-25.63)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
        "                </g>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"24\" class=\"nad-vl180to300-line\">\n",
-       "            <polyline class=\"nad-edge-path nad-stretchable\" points=\"317.18,556.21 -165.74,520.55\"/>\n",
-       "            <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(284.77,553.82)\">\n",
-       "                <g class=\"nad-active nad-state-out\">\n",
-       "                    <g transform=\"rotate(-85.78)\">\n",
+       "            <polyline class=\"nad-edge-path nad-stretchable\" points=\"-179.89,167.23 -549.67,66.49\"/>\n",
+       "            <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(-211.25,158.68)\">\n",
+       "                <g class=\"nad-active\">\n",
+       "                    <g transform=\"rotate(-74.76)\">\n",
        "                        <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                        <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                    </g>\n",
-       "                    <text transform=\"rotate(-355.78)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
+       "                    <text transform=\"rotate(-344.76)\" x=\"-19.00\" style=\"text-anchor:end\"></text>\n",
        "                </g>\n",
        "            </g>\n",
        "        </g>\n",
        "        <g id=\"25\" class=\"nad-vl0to30-line\">\n",
-       "            <polyline class=\"nad-edge-path nad-stretchable\" points=\"-572.49,502.43 -214.38,493.97\"/>\n",
-       "            <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(-539.99,501.66)\">\n",
-       "                <g class=\"nad-active nad-state-out\">\n",
-       "                    <g transform=\"rotate(88.65)\">\n",
+       "            <polyline class=\"nad-edge-path nad-stretchable\" points=\"-937.98,142.09 -603.22,52.18\"/>\n",
+       "            <g class=\"nad-glued-1 nad-edge-infos\" transform=\"translate(-906.59,133.66)\">\n",
+       "                <g class=\"nad-active\">\n",
+       "                    <g transform=\"rotate(74.97)\">\n",
        "                        <path class=\"nad-arrow-in\" transform=\"scale(10.00)\" d=\"M-1 -1 H1 L0 1z\"/>\n",
        "                        <path class=\"nad-arrow-out\" transform=\"scale(10.00)\" d=\"M-1 1 H1 L0 -1z\"/>\n",
        "                    </g>\n",
-       "                    <text transform=\"rotate(-1.35)\" x=\"19.00\"></text>\n",
+       "                    <text transform=\"rotate(-15.03)\" x=\"19.00\"></text>\n",
        "                </g>\n",
        "            </g>\n",
        "        </g>\n",
        "    </g>\n",
        "    <g class=\"nad-3wt-nodes\">\n",
-       "        <g id=\"22\" transform=\"translate(-182.39,493.22)\">\n",
-       "            <circle class=\"nad-vl300to500-line nad-winding\" cx=\"5.75\" cy=\"-10.53\" r=\"20.00\"/>\n",
-       "            <circle class=\"nad-vl180to300-line nad-winding\" cx=\"6.24\" cy=\"10.25\" r=\"20.00\"/>\n",
-       "            <circle class=\"nad-vl0to30-line nad-winding\" cx=\"-12.00\" cy=\"0.28\" r=\"20.00\"/>\n",
+       "        <g id=\"22\" transform=\"translate(-572.31,43.88)\">\n",
+       "            <circle class=\"nad-vl300to500-line nad-winding\" cx=\"3.10\" cy=\"-11.59\" r=\"20.00\"/>\n",
+       "            <circle class=\"nad-vl180to300-line nad-winding\" cx=\"8.49\" cy=\"8.48\" r=\"20.00\"/>\n",
+       "            <circle class=\"nad-vl0to30-line nad-winding\" cx=\"-11.59\" cy=\"3.11\" r=\"20.00\"/>\n",
        "        </g>\n",
        "    </g>\n",
        "    <g class=\"nad-text-edges\">\n",
-       "        <polyline id=\"0-textedge\" points=\"970.28,-523.05 1040.61,-533.60\"/>\n",
-       "        <polyline id=\"2-textedge\" points=\"128.85,283.38 199.18,272.83\"/>\n",
-       "        <polyline id=\"4-textedge\" points=\"444.03,1244.24 514.36,1233.69\"/>\n",
-       "        <polyline id=\"6-textedge\" points=\"268.60,855.61 338.94,845.06\"/>\n",
-       "        <polyline id=\"8-textedge\" points=\"1309.54,-26.19 1379.88,-36.74\"/>\n",
-       "        <polyline id=\"10-textedge\" points=\"-570.31,498.63 -499.98,488.08\"/>\n",
-       "        <polyline id=\"12-textedge\" points=\"374.13,555.20 444.46,544.65\"/>\n",
-       "        <polyline id=\"14-textedge\" points=\"409.49,-100.75 479.83,-111.29\"/>\n",
-       "        <polyline id=\"16-textedge\" points=\"881.81,-106.68 952.14,-117.23\"/>\n",
-       "        <polyline id=\"18-textedge\" points=\"770.50,326.85 840.84,316.31\"/>\n",
+       "        <polyline id=\"0-textedge\" points=\"588.90,-891.51 659.24,-902.06\"/>\n",
+       "        <polyline id=\"2-textedge\" points=\"-193.51,-156.99 -123.18,-167.54\"/>\n",
+       "        <polyline id=\"4-textedge\" points=\"198.69,807.86 269.02,797.31\"/>\n",
+       "        <polyline id=\"6-textedge\" points=\"25.09,428.15 95.42,417.60\"/>\n",
+       "        <polyline id=\"8-textedge\" points=\"937.50,-311.36 1007.83,-321.91\"/>\n",
+       "        <polyline id=\"10-textedge\" points=\"-934.87,144.77 -864.54,134.22\"/>\n",
+       "        <polyline id=\"12-textedge\" points=\"-123.99,171.02 -53.65,160.47\"/>\n",
+       "        <polyline id=\"14-textedge\" points=\"78.85,-521.00 149.18,-531.55\"/>\n",
+       "        <polyline id=\"16-textedge\" points=\"526.97,-466.28 597.30,-476.83\"/>\n",
+       "        <polyline id=\"18-textedge\" points=\"331.85,-53.81 402.18,-64.36\"/>\n",
        "    </g>\n",
        "    <g class=\"nad-text-nodes\">\n",
-       "        <foreignObject id=\"0-textnode\" y=\"-558.60\" x=\"1040.61\" height=\"1\" width=\"1\">\n",
+       "        <foreignObject id=\"0-textnode\" y=\"-927.06\" x=\"659.24\" height=\"1\" width=\"1\">\n",
        "            <div xmlns=\"http://www.w3.org/1999/xhtml\" class=\"nad-label-box\">\n",
        "                <div>15.8</div>\n",
        "                <table>\n",
@@ -2190,7 +2055,7 @@
        "                </table>\n",
        "            </div>\n",
        "        </foreignObject>\n",
-       "        <foreignObject id=\"2-textnode\" y=\"247.83\" x=\"199.18\" height=\"1\" width=\"1\">\n",
+       "        <foreignObject id=\"2-textnode\" y=\"-192.54\" x=\"-123.18\" height=\"1\" width=\"1\">\n",
        "            <div xmlns=\"http://www.w3.org/1999/xhtml\" class=\"nad-label-box\">\n",
        "                <div>380.0</div>\n",
        "                <table>\n",
@@ -2203,7 +2068,7 @@
        "                </table>\n",
        "            </div>\n",
        "        </foreignObject>\n",
-       "        <foreignObject id=\"4-textnode\" y=\"1208.69\" x=\"514.36\" height=\"1\" width=\"1\">\n",
+       "        <foreignObject id=\"4-textnode\" y=\"772.31\" x=\"269.02\" height=\"1\" width=\"1\">\n",
        "            <div xmlns=\"http://www.w3.org/1999/xhtml\" class=\"nad-label-box\">\n",
        "                <div>10.5</div>\n",
        "                <table>\n",
@@ -2216,7 +2081,7 @@
        "                </table>\n",
        "            </div>\n",
        "        </foreignObject>\n",
-       "        <foreignObject id=\"6-textnode\" y=\"820.06\" x=\"338.94\" height=\"1\" width=\"1\">\n",
+       "        <foreignObject id=\"6-textnode\" y=\"392.60\" x=\"95.42\" height=\"1\" width=\"1\">\n",
        "            <div xmlns=\"http://www.w3.org/1999/xhtml\" class=\"nad-label-box\">\n",
        "                <div>110.0</div>\n",
        "                <table>\n",
@@ -2229,7 +2094,7 @@
        "                </table>\n",
        "            </div>\n",
        "        </foreignObject>\n",
-       "        <foreignObject id=\"8-textnode\" y=\"-61.74\" x=\"1379.88\" height=\"1\" width=\"1\">\n",
+       "        <foreignObject id=\"8-textnode\" y=\"-346.91\" x=\"1007.83\" height=\"1\" width=\"1\">\n",
        "            <div xmlns=\"http://www.w3.org/1999/xhtml\" class=\"nad-label-box\">\n",
        "                <div>15.8</div>\n",
        "                <table>\n",
@@ -2242,7 +2107,7 @@
        "                </table>\n",
        "            </div>\n",
        "        </foreignObject>\n",
-       "        <foreignObject id=\"10-textnode\" y=\"463.08\" x=\"-499.98\" height=\"1\" width=\"1\">\n",
+       "        <foreignObject id=\"10-textnode\" y=\"109.22\" x=\"-864.54\" height=\"1\" width=\"1\">\n",
        "            <div xmlns=\"http://www.w3.org/1999/xhtml\" class=\"nad-label-box\">\n",
        "                <div>21.0</div>\n",
        "                <table>\n",
@@ -2255,7 +2120,7 @@
        "                </table>\n",
        "            </div>\n",
        "        </foreignObject>\n",
-       "        <foreignObject id=\"12-textnode\" y=\"519.65\" x=\"444.46\" height=\"1\" width=\"1\">\n",
+       "        <foreignObject id=\"12-textnode\" y=\"135.47\" x=\"-53.65\" height=\"1\" width=\"1\">\n",
        "            <div xmlns=\"http://www.w3.org/1999/xhtml\" class=\"nad-label-box\">\n",
        "                <div>225.0</div>\n",
        "                <table>\n",
@@ -2268,7 +2133,7 @@
        "                </table>\n",
        "            </div>\n",
        "        </foreignObject>\n",
-       "        <foreignObject id=\"14-textnode\" y=\"-136.29\" x=\"479.83\" height=\"1\" width=\"1\">\n",
+       "        <foreignObject id=\"14-textnode\" y=\"-556.55\" x=\"149.18\" height=\"1\" width=\"1\">\n",
        "            <div xmlns=\"http://www.w3.org/1999/xhtml\" class=\"nad-label-box\">\n",
        "                <div>400.0</div>\n",
        "                <table>\n",
@@ -2281,7 +2146,7 @@
        "                </table>\n",
        "            </div>\n",
        "        </foreignObject>\n",
-       "        <foreignObject id=\"16-textnode\" y=\"-142.23\" x=\"952.14\" height=\"1\" width=\"1\">\n",
+       "        <foreignObject id=\"16-textnode\" y=\"-501.83\" x=\"597.30\" height=\"1\" width=\"1\">\n",
        "            <div xmlns=\"http://www.w3.org/1999/xhtml\" class=\"nad-label-box\">\n",
        "                <div>220.0</div>\n",
        "                <table>\n",
@@ -2294,7 +2159,7 @@
        "                </table>\n",
        "            </div>\n",
        "        </foreignObject>\n",
-       "        <foreignObject id=\"18-textnode\" y=\"291.31\" x=\"840.84\" height=\"1\" width=\"1\">\n",
+       "        <foreignObject id=\"18-textnode\" y=\"-89.36\" x=\"402.18\" height=\"1\" width=\"1\">\n",
        "            <div xmlns=\"http://www.w3.org/1999/xhtml\" class=\"nad-label-box\">\n",
        "                <div>220.0</div>\n",
        "                <table>\n",
@@ -2311,10 +2176,10 @@
        "</svg>\n"
       ],
       "text/plain": [
-       "<pypowsybl.network.impl.svg.Svg at 0x7f8cd8525130>"
+       "<pypowsybl.network.impl.svg.Svg at 0x7855a39691b0>"
       ]
      },
-     "execution_count": 18,
+     "execution_count": 12,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -2332,7 +2197,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 19,
+   "execution_count": 13,
    "metadata": {},
    "outputs": [
     {
@@ -2391,7 +2256,7 @@
        "c49942d6-8b01-4b01-b5e8-f1180f84906c      NL  "
       ]
      },
-     "execution_count": 19,
+     "execution_count": 13,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -2402,7 +2267,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 20,
+   "execution_count": 14,
    "metadata": {},
    "outputs": [
     {
@@ -2465,7 +2330,7 @@
        "87f7002b-056f-4a6a-a872-1744eea757e3       Anvers        ELIA-Anvers      BE"
       ]
      },
-     "execution_count": 20,
+     "execution_count": 14,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -2487,7 +2352,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 21,
+   "execution_count": 15,
    "metadata": {
     "pycharm": {
      "name": "#%%\n"
@@ -2497,10 +2362,10 @@
     {
      "data": {
       "text/plain": [
-       "[ComponentResult(connected_component_num=0, synchronous_component_num=0, status=CONVERGED, status_text=CONVERGED, iteration_count=6, reference_bus_id='8d8a82ba-b5b0-4e94-861a-192af055f2b8_0', slack_bus_results=[SlackBusResult(id='8d8a82ba-b5b0-4e94-861a-192af055f2b8_0', active_power_mismatch=0.3282217078453442)], distributed_active_power=-44.13525678739042)]"
+       "[ComponentResult(connected_component_num=0, synchronous_component_num=0, status=CONVERGED, status_text=Converged, iteration_count=7, reference_bus_id='c1d5bfde8f8011e08e4d00247eb1f55e_0', slack_bus_results=[SlackBusResult(id='c1d5bfde8f8011e08e4d00247eb1f55e_0', active_power_mismatch=-0.21366219014484766)], distributed_active_power=-45.16664728458926)]"
       ]
      },
-     "execution_count": 21,
+     "execution_count": 15,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -2512,7 +2377,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 22,
+   "execution_count": 16,
    "metadata": {},
    "outputs": [
     {
@@ -2595,9 +2460,9 @@
        "      <td>100.256000</td>\n",
        "      <td>True</td>\n",
        "      <td>a708c3bc-465d-4fe7-b6ef-6fa6408a62b0</td>\n",
-       "      <td>-85.354183</td>\n",
-       "      <td>-27.088380</td>\n",
-       "      <td>4689.473090</td>\n",
+       "      <td>-85.245616</td>\n",
+       "      <td>57.537385</td>\n",
+       "      <td>5682.888931</td>\n",
        "      <td>4ba71b59-ee2f-450b-9f7d-cc2f1cc5e386</td>\n",
        "      <td>4ba71b59-ee2f-450b-9f7d-cc2f1cc5e386_0</td>\n",
        "      <td>True</td>\n",
@@ -2617,9 +2482,9 @@
        "      <td>18.720301</td>\n",
        "      <td>True</td>\n",
        "      <td>550ebe0d-f2b2-48c1-991f-cebea43a21aa</td>\n",
-       "      <td>-113.354183</td>\n",
-       "      <td>-24.705000</td>\n",
-       "      <td>3046.407443</td>\n",
+       "      <td>-113.245616</td>\n",
+       "      <td>-84.453532</td>\n",
+       "      <td>3709.545342</td>\n",
        "      <td>929ba893-c9dc-44d7-b1fd-30834bd3ab85</td>\n",
        "      <td>929ba893-c9dc-44d7-b1fd-30834bd3ab85_0</td>\n",
        "      <td>True</td>\n",
@@ -2639,9 +2504,9 @@
        "      <td>77.743000</td>\n",
        "      <td>True</td>\n",
        "      <td>2844585c-0d35-488d-a449-685bcd57afbf</td>\n",
-       "      <td>-134.192729</td>\n",
+       "      <td>-134.057020</td>\n",
        "      <td>-0.000000</td>\n",
-       "      <td>4765.160785</td>\n",
+       "      <td>4781.183683</td>\n",
        "      <td>2a37dc57-2faf-464a-8175-bc415f9a635f</td>\n",
        "      <td>2a37dc57-2faf-464a-8175-bc415f9a635f_0</td>\n",
        "      <td>True</td>\n",
@@ -2661,9 +2526,9 @@
        "      <td>83.296000</td>\n",
        "      <td>True</td>\n",
        "      <td>1dc9afba-23b5-41a0-8540-b479ed8baf4b</td>\n",
-       "      <td>-144.192729</td>\n",
+       "      <td>-144.057020</td>\n",
        "      <td>-0.000000</td>\n",
-       "      <td>5120.259069</td>\n",
+       "      <td>5137.836671</td>\n",
        "      <td>2a37dc57-2faf-464a-8175-bc415f9a635f</td>\n",
        "      <td>2a37dc57-2faf-464a-8175-bc415f9a635f_0</td>\n",
        "      <td>True</td>\n",
@@ -2683,9 +2548,9 @@
        "      <td>386.922556</td>\n",
        "      <td>True</td>\n",
        "      <td>9c3b8f97-7972-477d-9dc8-87365cc0ad0e</td>\n",
-       "      <td>-577.263618</td>\n",
-       "      <td>-166.129473</td>\n",
-       "      <td>21630.359223</td>\n",
+       "      <td>-576.720781</td>\n",
+       "      <td>-206.084407</td>\n",
+       "      <td>22053.200473</td>\n",
        "      <td>8d8a82ba-b5b0-4e94-861a-192af055f2b8</td>\n",
        "      <td>8d8a82ba-b5b0-4e94-861a-192af055f2b8_0</td>\n",
        "      <td>True</td>\n",
@@ -2737,11 +2602,11 @@
        "\n",
        "                                               p           q             i  \\\n",
        "id                                                                           \n",
-       "3a3b27be-b18b-4385-b557-6735d733baf0  -85.354183  -27.088380   4689.473090   \n",
-       "550ebe0d-f2b2-48c1-991f-cebea43a21aa -113.354183  -24.705000   3046.407443   \n",
-       "2844585c-0d35-488d-a449-685bcd57afbf -134.192729   -0.000000   4765.160785   \n",
-       "1dc9afba-23b5-41a0-8540-b479ed8baf4b -144.192729   -0.000000   5120.259069   \n",
-       "9c3b8f97-7972-477d-9dc8-87365cc0ad0e -577.263618 -166.129473  21630.359223   \n",
+       "3a3b27be-b18b-4385-b557-6735d733baf0  -85.245616   57.537385   5682.888931   \n",
+       "550ebe0d-f2b2-48c1-991f-cebea43a21aa -113.245616  -84.453532   3709.545342   \n",
+       "2844585c-0d35-488d-a449-685bcd57afbf -134.057020   -0.000000   4781.183683   \n",
+       "1dc9afba-23b5-41a0-8540-b479ed8baf4b -144.057020   -0.000000   5137.836671   \n",
+       "9c3b8f97-7972-477d-9dc8-87365cc0ad0e -576.720781 -206.084407  22053.200473   \n",
        "\n",
        "                                                          voltage_level_id  \\\n",
        "id                                                                           \n",
@@ -2768,7 +2633,7 @@
        "9c3b8f97-7972-477d-9dc8-87365cc0ad0e       True  "
       ]
      },
-     "execution_count": 22,
+     "execution_count": 16,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -2790,7 +2655,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 23,
+   "execution_count": 17,
    "metadata": {
     "pycharm": {
      "name": "#%%\n"
@@ -2800,10 +2665,10 @@
     {
      "data": {
       "text/plain": [
-       "90.0"
+       "np.float64(90.0)"
       ]
      },
-     "execution_count": 23,
+     "execution_count": 17,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -2826,7 +2691,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 24,
+   "execution_count": 18,
    "metadata": {
     "pycharm": {
      "name": "#%%\n"
@@ -2850,7 +2715,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 25,
+   "execution_count": 19,
    "metadata": {
     "pycharm": {
      "name": "#%%\n"
@@ -2860,10 +2725,10 @@
     {
      "data": {
       "text/plain": [
-       "100.0"
+       "np.float64(100.0)"
       ]
      },
-     "execution_count": 25,
+     "execution_count": 19,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -2886,7 +2751,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 26,
+   "execution_count": 20,
    "metadata": {
     "pycharm": {
      "name": "#%%\n"
@@ -2896,10 +2761,10 @@
     {
      "data": {
       "text/plain": [
-       "[ComponentResult(connected_component_num=0, synchronous_component_num=0, status=CONVERGED, status_text=CONVERGED, iteration_count=7, reference_bus_id='8d8a82ba-b5b0-4e94-861a-192af055f2b8_0', slack_bus_results=[SlackBusResult(id='8d8a82ba-b5b0-4e94-861a-192af055f2b8_0', active_power_mismatch=0.3444775195734273)], distributed_active_power=-54.24227251491311)]"
+       "[ComponentResult(connected_component_num=0, synchronous_component_num=0, status=CONVERGED, status_text=Converged, iteration_count=7, reference_bus_id='c1d5bfde8f8011e08e4d00247eb1f55e_0', slack_bus_results=[SlackBusResult(id='c1d5bfde8f8011e08e4d00247eb1f55e_0', active_power_mismatch=-0.25955289487091804)], distributed_active_power=-55.2225126815256)]"
       ]
      },
-     "execution_count": 26,
+     "execution_count": 20,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -2922,7 +2787,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 27,
+   "execution_count": 21,
    "metadata": {
     "pycharm": {
      "name": "#%%\n"
@@ -3009,9 +2874,9 @@
        "      <td>100.256000</td>\n",
        "      <td>True</td>\n",
        "      <td>a708c3bc-465d-4fe7-b6ef-6fa6408a62b0</td>\n",
-       "      <td>-94.290287</td>\n",
-       "      <td>-26.937530</td>\n",
-       "      <td>5135.284664</td>\n",
+       "      <td>-94.187104</td>\n",
+       "      <td>58.301221</td>\n",
+       "      <td>6123.602646</td>\n",
        "      <td>4ba71b59-ee2f-450b-9f7d-cc2f1cc5e386</td>\n",
        "      <td>4ba71b59-ee2f-450b-9f7d-cc2f1cc5e386_0</td>\n",
        "      <td>True</td>\n",
@@ -3031,9 +2896,9 @@
        "      <td>18.720301</td>\n",
        "      <td>True</td>\n",
        "      <td>550ebe0d-f2b2-48c1-991f-cebea43a21aa</td>\n",
-       "      <td>-112.290287</td>\n",
-       "      <td>-24.342298</td>\n",
-       "      <td>3017.085401</td>\n",
+       "      <td>-112.187104</td>\n",
+       "      <td>-84.603909</td>\n",
+       "      <td>3689.677534</td>\n",
        "      <td>929ba893-c9dc-44d7-b1fd-30834bd3ab85</td>\n",
        "      <td>929ba893-c9dc-44d7-b1fd-30834bd3ab85_0</td>\n",
        "      <td>True</td>\n",
@@ -3053,9 +2918,9 @@
        "      <td>77.743000</td>\n",
        "      <td>True</td>\n",
        "      <td>2844585c-0d35-488d-a449-685bcd57afbf</td>\n",
-       "      <td>-132.862859</td>\n",
+       "      <td>-132.733880</td>\n",
        "      <td>-0.000000</td>\n",
-       "      <td>4717.532906</td>\n",
+       "      <td>4733.761755</td>\n",
        "      <td>2a37dc57-2faf-464a-8175-bc415f9a635f</td>\n",
        "      <td>2a37dc57-2faf-464a-8175-bc415f9a635f_0</td>\n",
        "      <td>True</td>\n",
@@ -3075,9 +2940,9 @@
        "      <td>83.296000</td>\n",
        "      <td>True</td>\n",
        "      <td>1dc9afba-23b5-41a0-8540-b479ed8baf4b</td>\n",
-       "      <td>-142.862859</td>\n",
+       "      <td>-142.733880</td>\n",
        "      <td>-0.000000</td>\n",
-       "      <td>5072.600751</td>\n",
+       "      <td>5090.397284</td>\n",
        "      <td>2a37dc57-2faf-464a-8175-bc415f9a635f</td>\n",
        "      <td>2a37dc57-2faf-464a-8175-bc415f9a635f_0</td>\n",
        "      <td>True</td>\n",
@@ -3097,9 +2962,9 @@
        "      <td>386.922556</td>\n",
        "      <td>True</td>\n",
        "      <td>9c3b8f97-7972-477d-9dc8-87365cc0ad0e</td>\n",
-       "      <td>-571.944137</td>\n",
-       "      <td>-165.116497</td>\n",
-       "      <td>21436.200746</td>\n",
+       "      <td>-571.428221</td>\n",
+       "      <td>-205.411167</td>\n",
+       "      <td>21865.615940</td>\n",
        "      <td>8d8a82ba-b5b0-4e94-861a-192af055f2b8</td>\n",
        "      <td>8d8a82ba-b5b0-4e94-861a-192af055f2b8_0</td>\n",
        "      <td>True</td>\n",
@@ -3151,11 +3016,11 @@
        "\n",
        "                                               p           q             i  \\\n",
        "id                                                                           \n",
-       "3a3b27be-b18b-4385-b557-6735d733baf0  -94.290287  -26.937530   5135.284664   \n",
-       "550ebe0d-f2b2-48c1-991f-cebea43a21aa -112.290287  -24.342298   3017.085401   \n",
-       "2844585c-0d35-488d-a449-685bcd57afbf -132.862859   -0.000000   4717.532906   \n",
-       "1dc9afba-23b5-41a0-8540-b479ed8baf4b -142.862859   -0.000000   5072.600751   \n",
-       "9c3b8f97-7972-477d-9dc8-87365cc0ad0e -571.944137 -165.116497  21436.200746   \n",
+       "3a3b27be-b18b-4385-b557-6735d733baf0  -94.187104   58.301221   6123.602646   \n",
+       "550ebe0d-f2b2-48c1-991f-cebea43a21aa -112.187104  -84.603909   3689.677534   \n",
+       "2844585c-0d35-488d-a449-685bcd57afbf -132.733880   -0.000000   4733.761755   \n",
+       "1dc9afba-23b5-41a0-8540-b479ed8baf4b -142.733880   -0.000000   5090.397284   \n",
+       "9c3b8f97-7972-477d-9dc8-87365cc0ad0e -571.428221 -205.411167  21865.615940   \n",
        "\n",
        "                                                          voltage_level_id  \\\n",
        "id                                                                           \n",
@@ -3182,7 +3047,7 @@
        "9c3b8f97-7972-477d-9dc8-87365cc0ad0e       True  "
       ]
      },
-     "execution_count": 27,
+     "execution_count": 21,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -3204,7 +3069,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 28,
+   "execution_count": 22,
    "metadata": {
     "pycharm": {
      "name": "#%%\n"
@@ -3285,12 +3150,12 @@
        "      <td>0.000021</td>\n",
        "      <td>0.000034</td>\n",
        "      <td>0.000021</td>\n",
-       "      <td>-17.587416</td>\n",
-       "      <td>-3.106957</td>\n",
-       "      <td>45.445906</td>\n",
-       "      <td>21.083981</td>\n",
-       "      <td>1.169710</td>\n",
-       "      <td>53.617718</td>\n",
+       "      <td>-17.685639</td>\n",
+       "      <td>-5.312858</td>\n",
+       "      <td>47.488283</td>\n",
+       "      <td>21.115713</td>\n",
+       "      <td>3.434416</td>\n",
+       "      <td>54.811563</td>\n",
        "      <td>b10b171b-3bc5-4849-bb1f-61ed9ea1ec7c</td>\n",
        "      <td>d0486169-2205-40b2-895e-b672ecb9e5fc</td>\n",
        "      <td>b10b171b-3bc5-4849-bb1f-61ed9ea1ec7c_0</td>\n",
@@ -3307,12 +3172,12 @@
        "      <td>0.000010</td>\n",
        "      <td>0.000060</td>\n",
        "      <td>0.000010</td>\n",
-       "      <td>-6.224587</td>\n",
-       "      <td>-1.330019</td>\n",
-       "      <td>16.196622</td>\n",
-       "      <td>12.424309</td>\n",
-       "      <td>0.418134</td>\n",
-       "      <td>31.565048</td>\n",
+       "      <td>-6.336742</td>\n",
+       "      <td>-2.391001</td>\n",
+       "      <td>17.417027</td>\n",
+       "      <td>12.417184</td>\n",
+       "      <td>1.507009</td>\n",
+       "      <td>32.047555</td>\n",
        "      <td>b10b171b-3bc5-4849-bb1f-61ed9ea1ec7c</td>\n",
        "      <td>d0486169-2205-40b2-895e-b672ecb9e5fc</td>\n",
        "      <td>b10b171b-3bc5-4849-bb1f-61ed9ea1ec7c_0</td>\n",
@@ -3332,18 +3197,18 @@
        "\n",
        "                                            b1        g2        b2         p1  \\\n",
        "id                                                                              \n",
-       "b58bf21a-096a-4dae-9a01-3f03b60c24c7  0.000021  0.000034  0.000021 -17.587416   \n",
-       "ffbabc27-1ccd-4fdc-b037-e341706c8d29  0.000010  0.000060  0.000010  -6.224587   \n",
+       "b58bf21a-096a-4dae-9a01-3f03b60c24c7  0.000021  0.000034  0.000021 -17.685639   \n",
+       "ffbabc27-1ccd-4fdc-b037-e341706c8d29  0.000010  0.000060  0.000010  -6.336742   \n",
        "\n",
        "                                            q1         i1         p2  \\\n",
        "id                                                                     \n",
-       "b58bf21a-096a-4dae-9a01-3f03b60c24c7 -3.106957  45.445906  21.083981   \n",
-       "ffbabc27-1ccd-4fdc-b037-e341706c8d29 -1.330019  16.196622  12.424309   \n",
+       "b58bf21a-096a-4dae-9a01-3f03b60c24c7 -5.312858  47.488283  21.115713   \n",
+       "ffbabc27-1ccd-4fdc-b037-e341706c8d29 -2.391001  17.417027  12.417184   \n",
        "\n",
        "                                            q2         i2  \\\n",
        "id                                                          \n",
-       "b58bf21a-096a-4dae-9a01-3f03b60c24c7  1.169710  53.617718   \n",
-       "ffbabc27-1ccd-4fdc-b037-e341706c8d29  0.418134  31.565048   \n",
+       "b58bf21a-096a-4dae-9a01-3f03b60c24c7  3.434416  54.811563   \n",
+       "ffbabc27-1ccd-4fdc-b037-e341706c8d29  1.507009  32.047555   \n",
        "\n",
        "                                                         voltage_level1_id  \\\n",
        "id                                                                           \n",
@@ -3371,7 +3236,7 @@
        "ffbabc27-1ccd-4fdc-b037-e341706c8d29        True        True  "
       ]
      },
-     "execution_count": 28,
+     "execution_count": 22,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -3382,7 +3247,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 29,
+   "execution_count": 23,
    "metadata": {},
    "outputs": [
     {
@@ -3421,6 +3286,7 @@
        "      <th>connected</th>\n",
        "      <th>pairing_key</th>\n",
        "      <th>ucte_xnode_code</th>\n",
+       "      <th>paired</th>\n",
        "      <th>tie_line_id</th>\n",
        "    </tr>\n",
        "    <tr>\n",
@@ -3441,6 +3307,7 @@
        "      <th></th>\n",
        "      <th></th>\n",
        "      <th></th>\n",
+       "      <th></th>\n",
        "    </tr>\n",
        "  </thead>\n",
        "  <tbody>\n",
@@ -3453,14 +3320,15 @@
        "      <td>0.000025</td>\n",
        "      <td>-43.687227</td>\n",
        "      <td>84.876604</td>\n",
-       "      <td>-43.858954</td>\n",
-       "      <td>88.851000</td>\n",
-       "      <td>136.736232</td>\n",
+       "      <td>-44.074415</td>\n",
+       "      <td>79.398809</td>\n",
+       "      <td>126.703886</td>\n",
        "      <td>469df5f7-058f-4451-a998-57a48e8a56fe</td>\n",
        "      <td>469df5f7-058f-4451-a998-57a48e8a56fe_0</td>\n",
        "      <td>True</td>\n",
        "      <td>TN_Border_MA11</td>\n",
        "      <td>TN_Border_MA11</td>\n",
+       "      <td>True</td>\n",
        "      <td>dad02278-bd25-476f-8f58-dbe44be72586 + ed0c5d7...</td>\n",
        "    </tr>\n",
        "    <tr>\n",
@@ -3472,14 +3340,15 @@
        "      <td>0.000066</td>\n",
        "      <td>-90.037005</td>\n",
        "      <td>148.603743</td>\n",
-       "      <td>-90.648689</td>\n",
-       "      <td>149.265265</td>\n",
-       "      <td>240.990783</td>\n",
+       "      <td>-90.107574</td>\n",
+       "      <td>132.603780</td>\n",
+       "      <td>223.687774</td>\n",
        "      <td>469df5f7-058f-4451-a998-57a48e8a56fe</td>\n",
        "      <td>469df5f7-058f-4451-a998-57a48e8a56fe_0</td>\n",
        "      <td>True</td>\n",
        "      <td>TN_Border_GY11</td>\n",
        "      <td>TN_Border_GY11</td>\n",
+       "      <td>True</td>\n",
        "      <td>b18cd1aa-7808-49b9-a7cf-605eaf07b006 + e8acf6b...</td>\n",
        "    </tr>\n",
        "    <tr>\n",
@@ -3491,14 +3360,15 @@
        "      <td>0.000150</td>\n",
        "      <td>-46.816625</td>\n",
        "      <td>79.193778</td>\n",
-       "      <td>-39.220349</td>\n",
-       "      <td>59.054995</td>\n",
-       "      <td>97.829358</td>\n",
+       "      <td>-39.254095</td>\n",
+       "      <td>50.754496</td>\n",
+       "      <td>89.522972</td>\n",
        "      <td>469df5f7-058f-4451-a998-57a48e8a56fe</td>\n",
        "      <td>469df5f7-058f-4451-a998-57a48e8a56fe_0</td>\n",
        "      <td>True</td>\n",
        "      <td>TN_Border_AL11</td>\n",
        "      <td>TN_Border_AL11</td>\n",
+       "      <td>True</td>\n",
        "      <td>78736387-5f60-4832-b3fe-d50daf81b0a6 + 7f43f50...</td>\n",
        "    </tr>\n",
        "    <tr>\n",
@@ -3510,14 +3380,15 @@
        "      <td>0.000022</td>\n",
        "      <td>-26.805006</td>\n",
        "      <td>1.489867</td>\n",
-       "      <td>-16.237023</td>\n",
-       "      <td>1.123689</td>\n",
-       "      <td>41.326852</td>\n",
+       "      <td>-16.294068</td>\n",
+       "      <td>-0.556141</td>\n",
+       "      <td>41.771397</td>\n",
        "      <td>d0486169-2205-40b2-895e-b672ecb9e5fc</td>\n",
        "      <td>d0486169-2205-40b2-895e-b672ecb9e5fc_0</td>\n",
        "      <td>True</td>\n",
        "      <td>TN_Border_ST24</td>\n",
        "      <td>TN_Border_ST24</td>\n",
+       "      <td>True</td>\n",
        "      <td>a16b4a6c-70b1-4abf-9a9d-bd0fa47f9fe4 + a279a3d...</td>\n",
        "    </tr>\n",
        "    <tr>\n",
@@ -3529,14 +3400,15 @@
        "      <td>0.000083</td>\n",
        "      <td>-27.365225</td>\n",
        "      <td>0.425626</td>\n",
-       "      <td>-18.271265</td>\n",
-       "      <td>-2.711533</td>\n",
-       "      <td>46.901585</td>\n",
+       "      <td>-18.238829</td>\n",
+       "      <td>-4.385284</td>\n",
+       "      <td>48.061508</td>\n",
        "      <td>d0486169-2205-40b2-895e-b672ecb9e5fc</td>\n",
        "      <td>d0486169-2205-40b2-895e-b672ecb9e5fc_0</td>\n",
        "      <td>True</td>\n",
        "      <td>TN_Border_ST23</td>\n",
        "      <td>TN_Border_ST23</td>\n",
+       "      <td>True</td>\n",
        "      <td>17086487-56ba-4979-b8de-064025a6b4da + 8fdc7ab...</td>\n",
        "    </tr>\n",
        "    <tr>\n",
@@ -3548,14 +3420,15 @@
        "      <td>0.000020</td>\n",
        "      <td>26.805006</td>\n",
        "      <td>-1.489867</td>\n",
-       "      <td>20.466345</td>\n",
-       "      <td>-2.289792</td>\n",
-       "      <td>52.347008</td>\n",
+       "      <td>20.460359</td>\n",
+       "      <td>-0.575155</td>\n",
+       "      <td>52.257277</td>\n",
        "      <td>c1d5bfea8f8011e08e4d00247eb1f55e</td>\n",
        "      <td>c1d5bfea8f8011e08e4d00247eb1f55e_0</td>\n",
        "      <td>True</td>\n",
        "      <td>TN_Border_ST24</td>\n",
        "      <td>TN_Border_ST24</td>\n",
+       "      <td>True</td>\n",
        "      <td>a16b4a6c-70b1-4abf-9a9d-bd0fa47f9fe4 + a279a3d...</td>\n",
        "    </tr>\n",
        "    <tr>\n",
@@ -3567,14 +3440,15 @@
        "      <td>0.000090</td>\n",
        "      <td>27.365225</td>\n",
        "      <td>-0.425626</td>\n",
-       "      <td>21.145972</td>\n",
-       "      <td>-5.181329</td>\n",
-       "      <td>55.339945</td>\n",
+       "      <td>21.074380</td>\n",
+       "      <td>-3.384612</td>\n",
+       "      <td>54.493757</td>\n",
        "      <td>c1d5bfea8f8011e08e4d00247eb1f55e</td>\n",
        "      <td>c1d5bfea8f8011e08e4d00247eb1f55e_0</td>\n",
        "      <td>True</td>\n",
        "      <td>TN_Border_ST23</td>\n",
        "      <td>TN_Border_ST23</td>\n",
+       "      <td>True</td>\n",
        "      <td>17086487-56ba-4979-b8de-064025a6b4da + 8fdc7ab...</td>\n",
        "    </tr>\n",
        "    <tr>\n",
@@ -3586,14 +3460,15 @@
        "      <td>0.000141</td>\n",
        "      <td>46.816625</td>\n",
        "      <td>-79.193778</td>\n",
-       "      <td>54.973610</td>\n",
-       "      <td>-108.150034</td>\n",
-       "      <td>169.292749</td>\n",
+       "      <td>54.662015</td>\n",
+       "      <td>-98.973320</td>\n",
+       "      <td>159.359054</td>\n",
        "      <td>c1d5bfde8f8011e08e4d00247eb1f55e</td>\n",
        "      <td>c1d5bfde8f8011e08e4d00247eb1f55e_0</td>\n",
        "      <td>True</td>\n",
        "      <td>TN_Border_AL11</td>\n",
        "      <td>TN_Border_AL11</td>\n",
+       "      <td>True</td>\n",
        "      <td>78736387-5f60-4832-b3fe-d50daf81b0a6 + 7f43f50...</td>\n",
        "    </tr>\n",
        "    <tr>\n",
@@ -3605,14 +3480,15 @@
        "      <td>0.000065</td>\n",
        "      <td>90.037005</td>\n",
        "      <td>-148.603743</td>\n",
-       "      <td>104.162080</td>\n",
-       "      <td>-169.365875</td>\n",
-       "      <td>277.456249</td>\n",
+       "      <td>103.320111</td>\n",
+       "      <td>-152.565573</td>\n",
+       "      <td>259.703284</td>\n",
        "      <td>c1d5bfde8f8011e08e4d00247eb1f55e</td>\n",
        "      <td>c1d5bfde8f8011e08e4d00247eb1f55e_0</td>\n",
        "      <td>True</td>\n",
        "      <td>TN_Border_GY11</td>\n",
        "      <td>TN_Border_GY11</td>\n",
+       "      <td>True</td>\n",
        "      <td>b18cd1aa-7808-49b9-a7cf-605eaf07b006 + e8acf6b...</td>\n",
        "    </tr>\n",
        "    <tr>\n",
@@ -3624,14 +3500,15 @@
        "      <td>0.000025</td>\n",
        "      <td>43.687227</td>\n",
        "      <td>-84.876604</td>\n",
-       "      <td>57.873034</td>\n",
-       "      <td>-96.129847</td>\n",
-       "      <td>156.575245</td>\n",
+       "      <td>57.778985</td>\n",
+       "      <td>-86.683186</td>\n",
+       "      <td>146.829004</td>\n",
        "      <td>c1d5bfde8f8011e08e4d00247eb1f55e</td>\n",
        "      <td>c1d5bfde8f8011e08e4d00247eb1f55e_0</td>\n",
        "      <td>True</td>\n",
        "      <td>TN_Border_MA11</td>\n",
        "      <td>TN_Border_MA11</td>\n",
+       "      <td>True</td>\n",
        "      <td>dad02278-bd25-476f-8f58-dbe44be72586 + ed0c5d7...</td>\n",
        "    </tr>\n",
        "  </tbody>\n",
@@ -3667,16 +3544,16 @@
        "\n",
        "                                               p           q           i  \\\n",
        "id                                                                         \n",
-       "ed0c5d75-4a54-43c8-b782-b20d7431630b  -43.858954   88.851000  136.736232   \n",
-       "b18cd1aa-7808-49b9-a7cf-605eaf07b006  -90.648689  149.265265  240.990783   \n",
-       "78736387-5f60-4832-b3fe-d50daf81b0a6  -39.220349   59.054995   97.829358   \n",
-       "a16b4a6c-70b1-4abf-9a9d-bd0fa47f9fe4  -16.237023    1.123689   41.326852   \n",
-       "17086487-56ba-4979-b8de-064025a6b4da  -18.271265   -2.711533   46.901585   \n",
-       "a279a3dc-550b-426c-af3a-61b7be508dcc   20.466345   -2.289792   52.347008   \n",
-       "8fdc7abd-3746-481a-a65e-3df56acd8b13   21.145972   -5.181329   55.339945   \n",
-       "7f43f508-2496-4b64-9146-0a40406cbe49   54.973610 -108.150034  169.292749   \n",
-       "e8acf6b6-99cb-45ad-b8dc-16c7866a4ddc  104.162080 -169.365875  277.456249   \n",
-       "dad02278-bd25-476f-8f58-dbe44be72586   57.873034  -96.129847  156.575245   \n",
+       "ed0c5d75-4a54-43c8-b782-b20d7431630b  -44.074415   79.398809  126.703886   \n",
+       "b18cd1aa-7808-49b9-a7cf-605eaf07b006  -90.107574  132.603780  223.687774   \n",
+       "78736387-5f60-4832-b3fe-d50daf81b0a6  -39.254095   50.754496   89.522972   \n",
+       "a16b4a6c-70b1-4abf-9a9d-bd0fa47f9fe4  -16.294068   -0.556141   41.771397   \n",
+       "17086487-56ba-4979-b8de-064025a6b4da  -18.238829   -4.385284   48.061508   \n",
+       "a279a3dc-550b-426c-af3a-61b7be508dcc   20.460359   -0.575155   52.257277   \n",
+       "8fdc7abd-3746-481a-a65e-3df56acd8b13   21.074380   -3.384612   54.493757   \n",
+       "7f43f508-2496-4b64-9146-0a40406cbe49   54.662015  -98.973320  159.359054   \n",
+       "e8acf6b6-99cb-45ad-b8dc-16c7866a4ddc  103.320111 -152.565573  259.703284   \n",
+       "dad02278-bd25-476f-8f58-dbe44be72586   57.778985  -86.683186  146.829004   \n",
        "\n",
        "                                                          voltage_level_id  \\\n",
        "id                                                                           \n",
@@ -3717,18 +3594,18 @@
        "e8acf6b6-99cb-45ad-b8dc-16c7866a4ddc       True  TN_Border_GY11   \n",
        "dad02278-bd25-476f-8f58-dbe44be72586       True  TN_Border_MA11   \n",
        "\n",
-       "                                     ucte_xnode_code  \\\n",
-       "id                                                     \n",
-       "ed0c5d75-4a54-43c8-b782-b20d7431630b  TN_Border_MA11   \n",
-       "b18cd1aa-7808-49b9-a7cf-605eaf07b006  TN_Border_GY11   \n",
-       "78736387-5f60-4832-b3fe-d50daf81b0a6  TN_Border_AL11   \n",
-       "a16b4a6c-70b1-4abf-9a9d-bd0fa47f9fe4  TN_Border_ST24   \n",
-       "17086487-56ba-4979-b8de-064025a6b4da  TN_Border_ST23   \n",
-       "a279a3dc-550b-426c-af3a-61b7be508dcc  TN_Border_ST24   \n",
-       "8fdc7abd-3746-481a-a65e-3df56acd8b13  TN_Border_ST23   \n",
-       "7f43f508-2496-4b64-9146-0a40406cbe49  TN_Border_AL11   \n",
-       "e8acf6b6-99cb-45ad-b8dc-16c7866a4ddc  TN_Border_GY11   \n",
-       "dad02278-bd25-476f-8f58-dbe44be72586  TN_Border_MA11   \n",
+       "                                     ucte_xnode_code  paired  \\\n",
+       "id                                                             \n",
+       "ed0c5d75-4a54-43c8-b782-b20d7431630b  TN_Border_MA11    True   \n",
+       "b18cd1aa-7808-49b9-a7cf-605eaf07b006  TN_Border_GY11    True   \n",
+       "78736387-5f60-4832-b3fe-d50daf81b0a6  TN_Border_AL11    True   \n",
+       "a16b4a6c-70b1-4abf-9a9d-bd0fa47f9fe4  TN_Border_ST24    True   \n",
+       "17086487-56ba-4979-b8de-064025a6b4da  TN_Border_ST23    True   \n",
+       "a279a3dc-550b-426c-af3a-61b7be508dcc  TN_Border_ST24    True   \n",
+       "8fdc7abd-3746-481a-a65e-3df56acd8b13  TN_Border_ST23    True   \n",
+       "7f43f508-2496-4b64-9146-0a40406cbe49  TN_Border_AL11    True   \n",
+       "e8acf6b6-99cb-45ad-b8dc-16c7866a4ddc  TN_Border_GY11    True   \n",
+       "dad02278-bd25-476f-8f58-dbe44be72586  TN_Border_MA11    True   \n",
        "\n",
        "                                                                            tie_line_id  \n",
        "id                                                                                       \n",
@@ -3744,7 +3621,7 @@
        "dad02278-bd25-476f-8f58-dbe44be72586  dad02278-bd25-476f-8f58-dbe44be72586 + ed0c5d7...  "
       ]
      },
-     "execution_count": 29,
+     "execution_count": 23,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -3773,25 +3650,13 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 30,
+   "execution_count": 24,
    "metadata": {
     "pycharm": {
      "name": "#%%\n"
     }
    },
    "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "<enum 'ZoneKeyType'>\n",
-      "<enum 'ZoneKeyType'>\n",
-      "True\n",
-      "<enum 'ZoneKeyType'>\n",
-      "<enum 'ZoneKeyType'>\n",
-      "True\n"
-     ]
-    },
     {
      "data": {
       "text/html": [
@@ -3840,7 +3705,7 @@
        "BE -> NL                                                                       0.419779                          "
       ]
      },
-     "execution_count": 30,
+     "execution_count": 24,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -3854,11 +3719,348 @@
     "results = sa.run(eu)\n",
     "results.get_branch_flows_sensitivity_matrix()"
    ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "CGMES full export: by default, the EQ, SSH, TP and SV are exported."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 25,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "eu.save(\"./eu\", \"CGMES\")"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "To export only the SV, an extra parameter should be added:"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 26,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "eu.save(\"./eu_test\", \"CGMES\", parameters={'iidm.export.cgmes.profiles': 'SV'})"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "For information, the export parameters for the CGMES format are:"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 27,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<div>\n",
+       "<style scoped>\n",
+       "    .dataframe tbody tr th:only-of-type {\n",
+       "        vertical-align: middle;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe tbody tr th {\n",
+       "        vertical-align: top;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe thead th {\n",
+       "        text-align: right;\n",
+       "    }\n",
+       "</style>\n",
+       "<table border=\"1\" class=\"dataframe\">\n",
+       "  <thead>\n",
+       "    <tr style=\"text-align: right;\">\n",
+       "      <th></th>\n",
+       "      <th>description</th>\n",
+       "      <th>type</th>\n",
+       "      <th>default</th>\n",
+       "      <th>possible_values</th>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>name</th>\n",
+       "      <th></th>\n",
+       "      <th></th>\n",
+       "      <th></th>\n",
+       "      <th></th>\n",
+       "    </tr>\n",
+       "  </thead>\n",
+       "  <tbody>\n",
+       "    <tr>\n",
+       "      <th>iidm.export.cgmes.base-name</th>\n",
+       "      <td>Basename for output files</td>\n",
+       "      <td>STRING</td>\n",
+       "      <td></td>\n",
+       "      <td></td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>iidm.export.cgmes.cim-version</th>\n",
+       "      <td>CIM version to export</td>\n",
+       "      <td>STRING</td>\n",
+       "      <td></td>\n",
+       "      <td>[14, 16, 100]</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>iidm.export.cgmes.export-boundary-power-flows</th>\n",
+       "      <td>Export boundaries' power flows</td>\n",
+       "      <td>BOOLEAN</td>\n",
+       "      <td>true</td>\n",
+       "      <td></td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>iidm.export.cgmes.export-power-flows-for-switches</th>\n",
+       "      <td>Export power flows for switches</td>\n",
+       "      <td>BOOLEAN</td>\n",
+       "      <td>true</td>\n",
+       "      <td></td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>iidm.export.cgmes.naming-strategy</th>\n",
+       "      <td>Configure what type of naming strategy you want</td>\n",
+       "      <td>STRING</td>\n",
+       "      <td>identity</td>\n",
+       "      <td>[identity, cgmes, cgmes-fix-all-invalid-ids]</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>iidm.export.cgmes.profiles</th>\n",
+       "      <td>Profiles to export</td>\n",
+       "      <td>STRING_LIST</td>\n",
+       "      <td>[EQ, TP, SSH, SV]</td>\n",
+       "      <td>[EQ, TP, SSH, SV]</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>iidm.export.cgmes.cgm_export</th>\n",
+       "      <td>True for a CGM export, False for an IGM export</td>\n",
+       "      <td>BOOLEAN</td>\n",
+       "      <td>false</td>\n",
+       "      <td></td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>iidm.export.cgmes.boundary-EQ-identifier</th>\n",
+       "      <td>Boundary EQ model identifier</td>\n",
+       "      <td>STRING</td>\n",
+       "      <td></td>\n",
+       "      <td></td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>iidm.export.cgmes.boundary-TP-identifier</th>\n",
+       "      <td>Boundary TP model identifier</td>\n",
+       "      <td>STRING</td>\n",
+       "      <td></td>\n",
+       "      <td></td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>iidm.export.cgmes.modeling-authority-set</th>\n",
+       "      <td>Modeling authority set</td>\n",
+       "      <td>STRING</td>\n",
+       "      <td></td>\n",
+       "      <td></td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>iidm.export.cgmes.model-description</th>\n",
+       "      <td>Model description</td>\n",
+       "      <td>STRING</td>\n",
+       "      <td></td>\n",
+       "      <td></td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>iidm.export.cgmes.export-transformers-with-highest-voltage-at-end1</th>\n",
+       "      <td>Export transformers with highest voltage at end1</td>\n",
+       "      <td>BOOLEAN</td>\n",
+       "      <td>false</td>\n",
+       "      <td></td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>iidm.export.cgmes.sourcing-actor</th>\n",
+       "      <td>Sourcing actor name (for CGM business processes)</td>\n",
+       "      <td>STRING</td>\n",
+       "      <td></td>\n",
+       "      <td></td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>iidm.export.cgmes.export-load-flow-status</th>\n",
+       "      <td>Export load flow status of topological islands</td>\n",
+       "      <td>BOOLEAN</td>\n",
+       "      <td>true</td>\n",
+       "      <td></td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>iidm.export.cgmes.max-p-mismatch-converged</th>\n",
+       "      <td>Max mismatch in active power to consider a bus...</td>\n",
+       "      <td>DOUBLE</td>\n",
+       "      <td>0.1</td>\n",
+       "      <td></td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>iidm.export.cgmes.max-q-mismatch-converged</th>\n",
+       "      <td>Max mismatch in reactive power to consider a b...</td>\n",
+       "      <td>DOUBLE</td>\n",
+       "      <td>0.1</td>\n",
+       "      <td></td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>iidm.export.cgmes.export-sv-injections-for-slacks</th>\n",
+       "      <td>Export SvInjections with the mismatch of slack...</td>\n",
+       "      <td>BOOLEAN</td>\n",
+       "      <td>true</td>\n",
+       "      <td></td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>iidm.export.cgmes.uuid-namespace</th>\n",
+       "      <td>Namespace to use for name-based UUID generatio...</td>\n",
+       "      <td>STRING</td>\n",
+       "      <td>551699a3-6423-5ea2-9c3c-6b0b7fa8d731</td>\n",
+       "      <td></td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>iidm.export.cgmes.model-version</th>\n",
+       "      <td>Model version</td>\n",
+       "      <td>STRING</td>\n",
+       "      <td></td>\n",
+       "      <td></td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>iidm.export.cgmes.business-process</th>\n",
+       "      <td>Business process</td>\n",
+       "      <td>STRING</td>\n",
+       "      <td>1D</td>\n",
+       "      <td></td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>iidm.export.cgmes.update-dependencies</th>\n",
+       "      <td>True if dependencies should be updated automat...</td>\n",
+       "      <td>BOOLEAN</td>\n",
+       "      <td>true</td>\n",
+       "      <td></td>\n",
+       "    </tr>\n",
+       "  </tbody>\n",
+       "</table>\n",
+       "</div>"
+      ],
+      "text/plain": [
+       "                                                                                          description  \\\n",
+       "name                                                                                                    \n",
+       "iidm.export.cgmes.base-name                                                 Basename for output files   \n",
+       "iidm.export.cgmes.cim-version                                                   CIM version to export   \n",
+       "iidm.export.cgmes.export-boundary-power-flows                          Export boundaries' power flows   \n",
+       "iidm.export.cgmes.export-power-flows-for-switches                     Export power flows for switches   \n",
+       "iidm.export.cgmes.naming-strategy                     Configure what type of naming strategy you want   \n",
+       "iidm.export.cgmes.profiles                                                         Profiles to export   \n",
+       "iidm.export.cgmes.cgm_export                           True for a CGM export, False for an IGM export   \n",
+       "iidm.export.cgmes.boundary-EQ-identifier                                 Boundary EQ model identifier   \n",
+       "iidm.export.cgmes.boundary-TP-identifier                                 Boundary TP model identifier   \n",
+       "iidm.export.cgmes.modeling-authority-set                                       Modeling authority set   \n",
+       "iidm.export.cgmes.model-description                                                 Model description   \n",
+       "iidm.export.cgmes.export-transformers-with-high...   Export transformers with highest voltage at end1   \n",
+       "iidm.export.cgmes.sourcing-actor                     Sourcing actor name (for CGM business processes)   \n",
+       "iidm.export.cgmes.export-load-flow-status              Export load flow status of topological islands   \n",
+       "iidm.export.cgmes.max-p-mismatch-converged          Max mismatch in active power to consider a bus...   \n",
+       "iidm.export.cgmes.max-q-mismatch-converged          Max mismatch in reactive power to consider a b...   \n",
+       "iidm.export.cgmes.export-sv-injections-for-slacks   Export SvInjections with the mismatch of slack...   \n",
+       "iidm.export.cgmes.uuid-namespace                    Namespace to use for name-based UUID generatio...   \n",
+       "iidm.export.cgmes.model-version                                                         Model version   \n",
+       "iidm.export.cgmes.business-process                                                   Business process   \n",
+       "iidm.export.cgmes.update-dependencies               True if dependencies should be updated automat...   \n",
+       "\n",
+       "                                                           type  \\\n",
+       "name                                                              \n",
+       "iidm.export.cgmes.base-name                              STRING   \n",
+       "iidm.export.cgmes.cim-version                            STRING   \n",
+       "iidm.export.cgmes.export-boundary-power-flows           BOOLEAN   \n",
+       "iidm.export.cgmes.export-power-flows-for-switches       BOOLEAN   \n",
+       "iidm.export.cgmes.naming-strategy                        STRING   \n",
+       "iidm.export.cgmes.profiles                          STRING_LIST   \n",
+       "iidm.export.cgmes.cgm_export                            BOOLEAN   \n",
+       "iidm.export.cgmes.boundary-EQ-identifier                 STRING   \n",
+       "iidm.export.cgmes.boundary-TP-identifier                 STRING   \n",
+       "iidm.export.cgmes.modeling-authority-set                 STRING   \n",
+       "iidm.export.cgmes.model-description                      STRING   \n",
+       "iidm.export.cgmes.export-transformers-with-high...      BOOLEAN   \n",
+       "iidm.export.cgmes.sourcing-actor                         STRING   \n",
+       "iidm.export.cgmes.export-load-flow-status               BOOLEAN   \n",
+       "iidm.export.cgmes.max-p-mismatch-converged               DOUBLE   \n",
+       "iidm.export.cgmes.max-q-mismatch-converged               DOUBLE   \n",
+       "iidm.export.cgmes.export-sv-injections-for-slacks       BOOLEAN   \n",
+       "iidm.export.cgmes.uuid-namespace                         STRING   \n",
+       "iidm.export.cgmes.model-version                          STRING   \n",
+       "iidm.export.cgmes.business-process                       STRING   \n",
+       "iidm.export.cgmes.update-dependencies                   BOOLEAN   \n",
+       "\n",
+       "                                                                                 default  \\\n",
+       "name                                                                                       \n",
+       "iidm.export.cgmes.base-name                                                                \n",
+       "iidm.export.cgmes.cim-version                                                              \n",
+       "iidm.export.cgmes.export-boundary-power-flows                                       true   \n",
+       "iidm.export.cgmes.export-power-flows-for-switches                                   true   \n",
+       "iidm.export.cgmes.naming-strategy                                               identity   \n",
+       "iidm.export.cgmes.profiles                                             [EQ, TP, SSH, SV]   \n",
+       "iidm.export.cgmes.cgm_export                                                       false   \n",
+       "iidm.export.cgmes.boundary-EQ-identifier                                                   \n",
+       "iidm.export.cgmes.boundary-TP-identifier                                                   \n",
+       "iidm.export.cgmes.modeling-authority-set                                                   \n",
+       "iidm.export.cgmes.model-description                                                        \n",
+       "iidm.export.cgmes.export-transformers-with-high...                                 false   \n",
+       "iidm.export.cgmes.sourcing-actor                                                           \n",
+       "iidm.export.cgmes.export-load-flow-status                                           true   \n",
+       "iidm.export.cgmes.max-p-mismatch-converged                                           0.1   \n",
+       "iidm.export.cgmes.max-q-mismatch-converged                                           0.1   \n",
+       "iidm.export.cgmes.export-sv-injections-for-slacks                                   true   \n",
+       "iidm.export.cgmes.uuid-namespace                    551699a3-6423-5ea2-9c3c-6b0b7fa8d731   \n",
+       "iidm.export.cgmes.model-version                                                            \n",
+       "iidm.export.cgmes.business-process                                                    1D   \n",
+       "iidm.export.cgmes.update-dependencies                                               true   \n",
+       "\n",
+       "                                                                                 possible_values  \n",
+       "name                                                                                              \n",
+       "iidm.export.cgmes.base-name                                                                       \n",
+       "iidm.export.cgmes.cim-version                                                      [14, 16, 100]  \n",
+       "iidm.export.cgmes.export-boundary-power-flows                                                     \n",
+       "iidm.export.cgmes.export-power-flows-for-switches                                                 \n",
+       "iidm.export.cgmes.naming-strategy                   [identity, cgmes, cgmes-fix-all-invalid-ids]  \n",
+       "iidm.export.cgmes.profiles                                                     [EQ, TP, SSH, SV]  \n",
+       "iidm.export.cgmes.cgm_export                                                                      \n",
+       "iidm.export.cgmes.boundary-EQ-identifier                                                          \n",
+       "iidm.export.cgmes.boundary-TP-identifier                                                          \n",
+       "iidm.export.cgmes.modeling-authority-set                                                          \n",
+       "iidm.export.cgmes.model-description                                                               \n",
+       "iidm.export.cgmes.export-transformers-with-high...                                                \n",
+       "iidm.export.cgmes.sourcing-actor                                                                  \n",
+       "iidm.export.cgmes.export-load-flow-status                                                         \n",
+       "iidm.export.cgmes.max-p-mismatch-converged                                                        \n",
+       "iidm.export.cgmes.max-q-mismatch-converged                                                        \n",
+       "iidm.export.cgmes.export-sv-injections-for-slacks                                                 \n",
+       "iidm.export.cgmes.uuid-namespace                                                                  \n",
+       "iidm.export.cgmes.model-version                                                                   \n",
+       "iidm.export.cgmes.business-process                                                                \n",
+       "iidm.export.cgmes.update-dependencies                                                             "
+      ]
+     },
+     "execution_count": 27,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "pp.network.get_export_parameters(\"CGMES\")"
+   ]
   }
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -3872,7 +4074,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.10"
+   "version": "3.10.12"
   }
  },
  "nbformat": 4,