diff --git a/src/db/db/dbLayoutToNetlist.cc b/src/db/db/dbLayoutToNetlist.cc
index d59e947d2..6b9bf63cc 100644
--- a/src/db/db/dbLayoutToNetlist.cc
+++ b/src/db/db/dbLayoutToNetlist.cc
@@ -105,7 +105,7 @@ void LayoutToNetlist::keep_dss ()
 
 void LayoutToNetlist::init ()
 {
-  dss ().set_text_enlargement (1);
+  dss ().set_text_enlargement (0);
   dss ().set_text_property_name (tl::Variant ("LABEL"));
 }
 
diff --git a/testdata/algo/l2n_writer_au_2b.txt b/testdata/algo/l2n_writer_au_2b.txt
index ac5c60d66..d0986d5a1 100644
--- a/testdata/algo/l2n_writer_au_2b.txt
+++ b/testdata/algo/l2n_writer_au_2b.txt
@@ -123,8 +123,8 @@ circuit(INV2
   rect(poly (-1425 -630) (1300 360))
   rect(poly (-125 -2780) (250 1600))
   rect(poly (-250 1200) (250 1600))
-  rect(poly_lbl (-526 -1801) (2 2))
-  rect(poly_cont (-831 -111) (220 220))
+  rect(poly_lbl (-525 -1800) (0 0))
+  rect(poly_cont (-830 -110) (220 220))
  )
  net(3
   rect(poly (275 -250) (250 2500))
@@ -151,8 +151,8 @@ circuit(INV2
   polygon(metal1 (-110 110) (0 360) (140 0) (0 1240) (-320 0) (0 800) (360 0) (0 -440) (320 0) (0 -1960))
   rect(metal1 (-680 2400) (360 760))
   rect(metal1 (-360 -3560) (360 760))
-  rect(metal1_lbl (-181 1419) (2 2))
-  rect(psd (-276 524) (525 950))
+  rect(metal1_lbl (-180 1420) (0 0))
+  rect(psd (-275 525) (525 950))
   rect(nsd (-525 -3750) (525 950))
  )
  net(5 name(VSS)
@@ -165,8 +165,8 @@ circuit(INV2
   rect(via1 (-305 -705) (250 250))
   rect(via1 (-250 150) (250 250))
   rect(metal2 (-1525 -775) (2800 900))
-  rect(metal2_lbl (-161 -541) (2 2))
-  rect(nsd (-1516 -386) (550 950))
+  rect(metal2_lbl (-160 -540) (0 0))
+  rect(nsd (-1515 -385) (550 950))
  )
  net(6 name(VDD)
   rect(diff_cont (-110 2490) (220 220))
@@ -178,8 +178,8 @@ circuit(INV2
   rect(via1 (-305 -705) (250 250))
   rect(via1 (-250 150) (250 250))
   rect(metal2 (-1525 -775) (2800 900))
-  rect(metal2_lbl (-151 -451) (2 2))
-  rect(psd (-1526 -476) (550 950))
+  rect(metal2_lbl (-150 -450) (0 0))
+  rect(psd (-1525 -475) (550 950))
  )
  net(7 name(BULK)
   rect(diff_cont (-110 -1360) (220 220))
@@ -307,12 +307,12 @@ circuit(RINGO
   rect(via1 (-305 -305) (250 250))
   rect(via1 (24230 -250) (250 250))
   rect(metal2 (-24805 -325) (24880 400))
-  rect(metal2_lbl (-23161 -201) (2 2))
+  rect(metal2_lbl (-23160 -200) (0 0))
  )
  net(2 name(OSC)
   rect(via1 (24435 1675) (250 250))
   rect(metal2 (-325 -325) (400 400))
-  rect(metal2_lbl (-201 -201) (2 2))
+  rect(metal2_lbl (-200 -200) (0 0))
  )
  net(3 name(VDD)
   rect(metal1 (-180 3100) (360 1120))
@@ -325,7 +325,7 @@ circuit(RINGO
   rect(metal1 (2280 -1120) (360 1120))
   rect(metal1 (2280 -1120) (360 1120))
   rect(metal1 (2280 -1120) (360 1120))
-  rect(metal2_lbl (-23941 -1421) (2 2))
+  rect(metal2_lbl (-23940 -1420) (0 0))
  )
  net(4 name(VSS)
   rect(metal1 (-180 -1420) (360 1120))
@@ -338,7 +338,7 @@ circuit(RINGO
   rect(metal1 (2280 -1120) (360 1120))
   rect(metal1 (2280 -1120) (360 1120))
   rect(metal1 (2280 -1120) (360 1120))
-  rect(metal2_lbl (-23941 299) (2 2))
+  rect(metal2_lbl (-23940 300) (0 0))
  )
  net(5)
  net(6)
diff --git a/testdata/algo/l2n_writer_au_2s.txt b/testdata/algo/l2n_writer_au_2s.txt
index fd1c17892..e221c3892 100644
--- a/testdata/algo/l2n_writer_au_2s.txt
+++ b/testdata/algo/l2n_writer_au_2s.txt
@@ -102,8 +102,8 @@ X(INV2
   R(poly (-1425 -630) (1300 360))
   R(poly (-125 -2780) (250 1600))
   R(poly (-250 1200) (250 1600))
-  R(poly_lbl (-526 -1801) (2 2))
-  R(poly_cont (-831 -111) (220 220))
+  R(poly_lbl (-525 -1800) (0 0))
+  R(poly_cont (-830 -110) (220 220))
  )
  N(3
   R(poly (275 -250) (250 2500))
@@ -130,8 +130,8 @@ X(INV2
   Q(metal1 (-110 110) (0 360) (140 0) (0 1240) (-320 0) (0 800) (360 0) (0 -440) (320 0) (0 -1960))
   R(metal1 (-680 2400) (360 760))
   R(metal1 (-360 -3560) (360 760))
-  R(metal1_lbl (-181 1419) (2 2))
-  R(psd (-276 524) (525 950))
+  R(metal1_lbl (-180 1420) (0 0))
+  R(psd (-275 525) (525 950))
   R(nsd (-525 -3750) (525 950))
  )
  N(5 I(VSS)
@@ -144,8 +144,8 @@ X(INV2
   R(via1 (-305 -705) (250 250))
   R(via1 (-250 150) (250 250))
   R(metal2 (-1525 -775) (2800 900))
-  R(metal2_lbl (-161 -541) (2 2))
-  R(nsd (-1516 -386) (550 950))
+  R(metal2_lbl (-160 -540) (0 0))
+  R(nsd (-1515 -385) (550 950))
  )
  N(6 I(VDD)
   R(diff_cont (-110 2490) (220 220))
@@ -157,8 +157,8 @@ X(INV2
   R(via1 (-305 -705) (250 250))
   R(via1 (-250 150) (250 250))
   R(metal2 (-1525 -775) (2800 900))
-  R(metal2_lbl (-151 -451) (2 2))
-  R(psd (-1526 -476) (550 950))
+  R(metal2_lbl (-150 -450) (0 0))
+  R(psd (-1525 -475) (550 950))
  )
  N(7 I(BULK)
   R(diff_cont (-110 -1360) (220 220))
@@ -268,12 +268,12 @@ X(RINGO
   R(via1 (-305 -305) (250 250))
   R(via1 (24230 -250) (250 250))
   R(metal2 (-24805 -325) (24880 400))
-  R(metal2_lbl (-23161 -201) (2 2))
+  R(metal2_lbl (-23160 -200) (0 0))
  )
  N(2 I(OSC)
   R(via1 (24435 1675) (250 250))
   R(metal2 (-325 -325) (400 400))
-  R(metal2_lbl (-201 -201) (2 2))
+  R(metal2_lbl (-200 -200) (0 0))
  )
  N(3 I(VDD)
   R(metal1 (-180 3100) (360 1120))
@@ -286,7 +286,7 @@ X(RINGO
   R(metal1 (2280 -1120) (360 1120))
   R(metal1 (2280 -1120) (360 1120))
   R(metal1 (2280 -1120) (360 1120))
-  R(metal2_lbl (-23941 -1421) (2 2))
+  R(metal2_lbl (-23940 -1420) (0 0))
  )
  N(4 I(VSS)
   R(metal1 (-180 -1420) (360 1120))
@@ -299,7 +299,7 @@ X(RINGO
   R(metal1 (2280 -1120) (360 1120))
   R(metal1 (2280 -1120) (360 1120))
   R(metal1 (2280 -1120) (360 1120))
-  R(metal2_lbl (-23941 299) (2 2))
+  R(metal2_lbl (-23940 300) (0 0))
  )
  N(5)
  N(6)
diff --git a/testdata/algo/lvs_test1_au.lvsdb.1 b/testdata/algo/lvs_test1_au.lvsdb.1
index a73ab07a0..5a39ce9f2 100644
--- a/testdata/algo/lvs_test1_au.lvsdb.1
+++ b/testdata/algo/lvs_test1_au.lvsdb.1
@@ -129,8 +129,8 @@ layout(
    rect(poly (550 1200) (250 2400))
    rect(poly (-250 -6000) (250 2400))
    rect(poly (-1050 1200) (250 2400))
-   rect(poly_lbl (-526 -2601) (2 2))
-   rect(poly_cont (-831 -111) (220 220))
+   rect(poly_lbl (-525 -2600) (0 0))
+   rect(poly_cont (-830 -110) (220 220))
   )
   net(3 name(OUT)
    rect(diff_cont (-910 90) (220 220))
@@ -156,8 +156,8 @@ layout(
    rect(metal1 (1240 2040) (360 1560))
    rect(metal1 (-360 -5160) (360 1560))
    rect(metal1 (-1960 2040) (360 1560))
-   rect(metal1_lbl (1419 -2181) (2 2))
-   rect(psd (-276 524) (525 1750))
+   rect(metal1_lbl (1420 -2180) (0 0))
+   rect(psd (-275 525) (525 1750))
    rect(psd (-2100 -1750) (525 1750))
    rect(nsd (1050 -5350) (525 1750))
    rect(nsd (-2100 -1750) (525 1750))
@@ -178,8 +178,8 @@ layout(
    rect(via1 (-250 -1450) (250 250))
    rect(via1 (-250 150) (250 250))
    rect(metal2 (-1525 -775) (2800 1700))
-   rect(metal2_lbl (-161 -541) (2 2))
-   rect(nsd (-1516 -1186) (550 1750))
+   rect(metal2_lbl (-160 -540) (0 0))
+   rect(nsd (-1515 -1185) (550 1750))
   )
   net(5 name(VDD)
    rect(diff_cont (-110 2490) (220 220))
@@ -197,8 +197,8 @@ layout(
    rect(via1 (-250 150) (250 250))
    rect(via1 (-250 150) (250 250))
    rect(metal2 (-1525 -1575) (2800 1700))
-   rect(metal2_lbl (-151 -1251) (2 2))
-   rect(psd (-1526 -476) (550 1750))
+   rect(metal2_lbl (-150 -1250) (0 0))
+   rect(psd (-1525 -475) (550 1750))
   )
   net(6 name(BULK)
    rect(diff_cont (-110 -2160) (220 220))
@@ -313,12 +313,12 @@ layout(
    rect(via1 (-305 -305) (250 250))
    rect(via1 (23190 -250) (250 250))
    rect(metal2 (-23765 -325) (23840 400))
-   rect(metal2_lbl (-22121 -201) (2 2))
+   rect(metal2_lbl (-22120 -200) (0 0))
   )
   net(2 name(OSC)
    rect(via1 (24435 1675) (250 250))
    rect(metal2 (-325 -325) (400 400))
-   rect(metal2_lbl (-201 -201) (2 2))
+   rect(metal2_lbl (-200 -200) (0 0))
   )
   net(3 name(VDD)
    rect(metal1 (-180 3900) (360 1120))
@@ -331,7 +331,7 @@ layout(
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
-   rect(metal2_lbl (-23941 -2221) (2 2))
+   rect(metal2_lbl (-23940 -2220) (0 0))
   )
   net(4 name(VSS)
    rect(metal1 (-180 -2220) (360 1120))
@@ -344,7 +344,7 @@ layout(
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
-   rect(metal2_lbl (-23941 1099) (2 2))
+   rect(metal2_lbl (-23940 1100) (0 0))
   )
   net(5)
   net(6)
diff --git a/testdata/algo/lvs_test1_au.lvsdb.2 b/testdata/algo/lvs_test1_au.lvsdb.2
index 20133d556..20cf60f64 100644
--- a/testdata/algo/lvs_test1_au.lvsdb.2
+++ b/testdata/algo/lvs_test1_au.lvsdb.2
@@ -129,8 +129,8 @@ layout(
    rect(poly (550 1200) (250 2400))
    rect(poly (-250 -6000) (250 2400))
    rect(poly (-1050 1200) (250 2400))
-   rect(poly_lbl (-526 -2601) (2 2))
-   rect(poly_cont (-831 -111) (220 220))
+   rect(poly_lbl (-525 -2600) (0 0))
+   rect(poly_cont (-830 -110) (220 220))
   )
   net(3 name(OUT)
    rect(diff_cont (-910 90) (220 220))
@@ -156,8 +156,8 @@ layout(
    rect(metal1 (1240 2040) (360 1560))
    rect(metal1 (-360 -5160) (360 1560))
    rect(metal1 (-1960 2040) (360 1560))
-   rect(metal1_lbl (1419 -2181) (2 2))
-   rect(psd (-1851 524) (525 1750))
+   rect(metal1_lbl (1420 -2180) (0 0))
+   rect(psd (-1850 525) (525 1750))
    rect(psd (1050 -1750) (525 1750))
    rect(nsd (-2100 -5350) (525 1750))
    rect(nsd (1050 -1750) (525 1750))
@@ -178,8 +178,8 @@ layout(
    rect(via1 (-250 -1450) (250 250))
    rect(via1 (-250 150) (250 250))
    rect(metal2 (-1525 -775) (2800 1700))
-   rect(metal2_lbl (-161 -541) (2 2))
-   rect(nsd (-1516 -1186) (550 1750))
+   rect(metal2_lbl (-160 -540) (0 0))
+   rect(nsd (-1515 -1185) (550 1750))
   )
   net(5 name(VDD)
    rect(diff_cont (-110 2490) (220 220))
@@ -197,8 +197,8 @@ layout(
    rect(via1 (-250 150) (250 250))
    rect(via1 (-250 150) (250 250))
    rect(metal2 (-1525 -1575) (2800 1700))
-   rect(metal2_lbl (-151 -1251) (2 2))
-   rect(psd (-1526 -476) (550 1750))
+   rect(metal2_lbl (-150 -1250) (0 0))
+   rect(psd (-1525 -475) (550 1750))
   )
   net(6 name(BULK)
    rect(diff_cont (-110 -2160) (220 220))
@@ -313,12 +313,12 @@ layout(
    rect(via1 (-305 -305) (250 250))
    rect(via1 (23190 -250) (250 250))
    rect(metal2 (-23765 -325) (23840 400))
-   rect(metal2_lbl (-22121 -201) (2 2))
+   rect(metal2_lbl (-22120 -200) (0 0))
   )
   net(2 name(OSC)
    rect(via1 (24435 1675) (250 250))
    rect(metal2 (-325 -325) (400 400))
-   rect(metal2_lbl (-201 -201) (2 2))
+   rect(metal2_lbl (-200 -200) (0 0))
   )
   net(3 name(VDD)
    rect(metal1 (-180 3900) (360 1120))
@@ -331,7 +331,7 @@ layout(
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
-   rect(metal2_lbl (-23941 -2221) (2 2))
+   rect(metal2_lbl (-23940 -2220) (0 0))
   )
   net(4 name(VSS)
    rect(metal1 (-180 -2220) (360 1120))
@@ -344,7 +344,7 @@ layout(
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
-   rect(metal2_lbl (-23941 1099) (2 2))
+   rect(metal2_lbl (-23940 1100) (0 0))
   )
   net(5)
   net(6)
diff --git a/testdata/algo/lvs_test1b_au.lvsdb.1 b/testdata/algo/lvs_test1b_au.lvsdb.1
index 3b206b741..677076a96 100644
--- a/testdata/algo/lvs_test1b_au.lvsdb.1
+++ b/testdata/algo/lvs_test1b_au.lvsdb.1
@@ -129,8 +129,8 @@ layout(
    rect(poly (550 1200) (250 2400))
    rect(poly (-250 -6000) (250 2400))
    rect(poly (-1050 1200) (250 2400))
-   rect(poly_lbl (-526 -2601) (2 2))
-   rect(poly_cont (-831 -111) (220 220))
+   rect(poly_lbl (-525 -2600) (0 0))
+   rect(poly_cont (-830 -110) (220 220))
   )
   net(3 name(OUT)
    rect(diff_cont (-910 90) (220 220))
@@ -156,8 +156,8 @@ layout(
    rect(metal1 (1240 2040) (360 1560))
    rect(metal1 (-360 -5160) (360 1560))
    rect(metal1 (-1960 2040) (360 1560))
-   rect(metal1_lbl (1419 -2181) (2 2))
-   rect(psd (-276 524) (525 1750))
+   rect(metal1_lbl (1420 -2180) (0 0))
+   rect(psd (-275 525) (525 1750))
    rect(psd (-2100 -1750) (525 1750))
    rect(nsd (1050 -5350) (525 1750))
    rect(nsd (-2100 -1750) (525 1750))
@@ -178,8 +178,8 @@ layout(
    rect(via1 (-250 -1450) (250 250))
    rect(via1 (-250 150) (250 250))
    rect(metal2 (-1525 -775) (2800 1700))
-   rect(metal2_lbl (-161 -541) (2 2))
-   rect(nsd (-1516 -1186) (550 1750))
+   rect(metal2_lbl (-160 -540) (0 0))
+   rect(nsd (-1515 -1185) (550 1750))
   )
   net(5 name(VDD)
    rect(diff_cont (-110 2490) (220 220))
@@ -197,8 +197,8 @@ layout(
    rect(via1 (-250 150) (250 250))
    rect(via1 (-250 150) (250 250))
    rect(metal2 (-1525 -1575) (2800 1700))
-   rect(metal2_lbl (-151 -1251) (2 2))
-   rect(psd (-1526 -476) (550 1750))
+   rect(metal2_lbl (-150 -1250) (0 0))
+   rect(psd (-1525 -475) (550 1750))
   )
   net(6 name(BULK)
    rect(diff_cont (-110 -2160) (220 220))
@@ -313,12 +313,12 @@ layout(
    rect(via1 (-305 -305) (250 250))
    rect(via1 (23190 -250) (250 250))
    rect(metal2 (-23765 -325) (23840 400))
-   rect(metal2_lbl (-22121 -201) (2 2))
+   rect(metal2_lbl (-22120 -200) (0 0))
   )
   net(2 name(OSC)
    rect(via1 (24435 1675) (250 250))
    rect(metal2 (-325 -325) (400 400))
-   rect(metal2_lbl (-201 -201) (2 2))
+   rect(metal2_lbl (-200 -200) (0 0))
   )
   net(3 name(VDD)
    rect(metal1 (-180 3900) (360 1120))
@@ -331,7 +331,7 @@ layout(
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
-   rect(metal2_lbl (-23941 -2221) (2 2))
+   rect(metal2_lbl (-23940 -2220) (0 0))
   )
   net(4 name(VSS)
    rect(metal1 (-180 -2220) (360 1120))
@@ -344,7 +344,7 @@ layout(
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
-   rect(metal2_lbl (-23941 1099) (2 2))
+   rect(metal2_lbl (-23940 1100) (0 0))
   )
   net(5)
   net(6)
diff --git a/testdata/algo/lvs_test1b_au.lvsdb.2 b/testdata/algo/lvs_test1b_au.lvsdb.2
index 455337d3b..a842f1785 100644
--- a/testdata/algo/lvs_test1b_au.lvsdb.2
+++ b/testdata/algo/lvs_test1b_au.lvsdb.2
@@ -129,8 +129,8 @@ layout(
    rect(poly (550 1200) (250 2400))
    rect(poly (-250 -6000) (250 2400))
    rect(poly (-1050 1200) (250 2400))
-   rect(poly_lbl (-526 -2601) (2 2))
-   rect(poly_cont (-831 -111) (220 220))
+   rect(poly_lbl (-525 -2600) (0 0))
+   rect(poly_cont (-830 -110) (220 220))
   )
   net(3 name(OUT)
    rect(diff_cont (-910 90) (220 220))
@@ -156,8 +156,8 @@ layout(
    rect(metal1 (1240 2040) (360 1560))
    rect(metal1 (-360 -5160) (360 1560))
    rect(metal1 (-1960 2040) (360 1560))
-   rect(metal1_lbl (1419 -2181) (2 2))
-   rect(psd (-1851 524) (525 1750))
+   rect(metal1_lbl (1420 -2180) (0 0))
+   rect(psd (-1850 525) (525 1750))
    rect(psd (1050 -1750) (525 1750))
    rect(nsd (-2100 -5350) (525 1750))
    rect(nsd (1050 -1750) (525 1750))
@@ -178,8 +178,8 @@ layout(
    rect(via1 (-250 -1450) (250 250))
    rect(via1 (-250 150) (250 250))
    rect(metal2 (-1525 -775) (2800 1700))
-   rect(metal2_lbl (-161 -541) (2 2))
-   rect(nsd (-1516 -1186) (550 1750))
+   rect(metal2_lbl (-160 -540) (0 0))
+   rect(nsd (-1515 -1185) (550 1750))
   )
   net(5 name(VDD)
    rect(diff_cont (-110 2490) (220 220))
@@ -197,8 +197,8 @@ layout(
    rect(via1 (-250 150) (250 250))
    rect(via1 (-250 150) (250 250))
    rect(metal2 (-1525 -1575) (2800 1700))
-   rect(metal2_lbl (-151 -1251) (2 2))
-   rect(psd (-1526 -476) (550 1750))
+   rect(metal2_lbl (-150 -1250) (0 0))
+   rect(psd (-1525 -475) (550 1750))
   )
   net(6 name(BULK)
    rect(diff_cont (-110 -2160) (220 220))
@@ -313,12 +313,12 @@ layout(
    rect(via1 (-305 -305) (250 250))
    rect(via1 (23190 -250) (250 250))
    rect(metal2 (-23765 -325) (23840 400))
-   rect(metal2_lbl (-22121 -201) (2 2))
+   rect(metal2_lbl (-22120 -200) (0 0))
   )
   net(2 name(OSC)
    rect(via1 (24435 1675) (250 250))
    rect(metal2 (-325 -325) (400 400))
-   rect(metal2_lbl (-201 -201) (2 2))
+   rect(metal2_lbl (-200 -200) (0 0))
   )
   net(3 name(VDD)
    rect(metal1 (-180 3900) (360 1120))
@@ -331,7 +331,7 @@ layout(
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
-   rect(metal2_lbl (-23941 -2221) (2 2))
+   rect(metal2_lbl (-23940 -2220) (0 0))
   )
   net(4 name(VSS)
    rect(metal1 (-180 -2220) (360 1120))
@@ -344,7 +344,7 @@ layout(
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
-   rect(metal2_lbl (-23941 1099) (2 2))
+   rect(metal2_lbl (-23940 1100) (0 0))
   )
   net(5)
   net(6)
diff --git a/testdata/algo/lvs_test2_au.lvsdb.1 b/testdata/algo/lvs_test2_au.lvsdb.1
index cecb9d910..eb088d4cf 100644
--- a/testdata/algo/lvs_test2_au.lvsdb.1
+++ b/testdata/algo/lvs_test2_au.lvsdb.1
@@ -129,8 +129,8 @@ layout(
    rect(poly (550 1200) (250 2400))
    rect(poly (-250 -6000) (250 2400))
    rect(poly (-1050 1200) (250 2400))
-   rect(poly_lbl (-526 -2601) (2 2))
-   rect(poly_cont (-831 -111) (220 220))
+   rect(poly_lbl (-525 -2600) (0 0))
+   rect(poly_cont (-830 -110) (220 220))
   )
   net(3 name(OUT)
    rect(diff_cont (-910 90) (220 220))
@@ -156,8 +156,8 @@ layout(
    rect(metal1 (1240 2040) (360 1560))
    rect(metal1 (-360 -5160) (360 1560))
    rect(metal1 (-1960 2040) (360 1560))
-   rect(metal1_lbl (1419 -2181) (2 2))
-   rect(psd (-276 524) (525 1750))
+   rect(metal1_lbl (1420 -2180) (0 0))
+   rect(psd (-275 525) (525 1750))
    rect(psd (-2100 -1750) (525 1750))
    rect(nsd (1050 -5350) (525 1750))
    rect(nsd (-2100 -1750) (525 1750))
@@ -178,8 +178,8 @@ layout(
    rect(via1 (-250 -1450) (250 250))
    rect(via1 (-250 150) (250 250))
    rect(metal2 (-1525 -775) (2800 1700))
-   rect(metal2_lbl (-161 -541) (2 2))
-   rect(nsd (-1516 -1186) (550 1750))
+   rect(metal2_lbl (-160 -540) (0 0))
+   rect(nsd (-1515 -1185) (550 1750))
   )
   net(5 name(VDD)
    rect(diff_cont (-110 2490) (220 220))
@@ -197,8 +197,8 @@ layout(
    rect(via1 (-250 150) (250 250))
    rect(via1 (-250 150) (250 250))
    rect(metal2 (-1525 -1575) (2800 1700))
-   rect(metal2_lbl (-151 -1251) (2 2))
-   rect(psd (-1526 -476) (550 1750))
+   rect(metal2_lbl (-150 -1250) (0 0))
+   rect(psd (-1525 -475) (550 1750))
   )
   net(6 name(BULK)
    rect(diff_cont (-110 -2160) (220 220))
@@ -313,12 +313,12 @@ layout(
    rect(via1 (-305 -305) (250 250))
    rect(via1 (23190 -250) (250 250))
    rect(metal2 (-23765 -325) (23840 400))
-   rect(metal2_lbl (-22121 -201) (2 2))
+   rect(metal2_lbl (-22120 -200) (0 0))
   )
   net(2 name(OSC)
    rect(via1 (24435 1675) (250 250))
    rect(metal2 (-325 -325) (400 400))
-   rect(metal2_lbl (-201 -201) (2 2))
+   rect(metal2_lbl (-200 -200) (0 0))
   )
   net(3 name(VDD)
    rect(metal1 (-180 3900) (360 1120))
@@ -331,7 +331,7 @@ layout(
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
-   rect(metal2_lbl (-23941 -2221) (2 2))
+   rect(metal2_lbl (-23940 -2220) (0 0))
   )
   net(4 name(VSS)
    rect(metal1 (-180 -2220) (360 1120))
@@ -344,7 +344,7 @@ layout(
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
-   rect(metal2_lbl (-23941 1099) (2 2))
+   rect(metal2_lbl (-23940 1100) (0 0))
   )
   net(5)
   net(6)
diff --git a/testdata/algo/lvs_test2_au.lvsdb.2 b/testdata/algo/lvs_test2_au.lvsdb.2
index 0ce0bf4d9..0d7635d17 100644
--- a/testdata/algo/lvs_test2_au.lvsdb.2
+++ b/testdata/algo/lvs_test2_au.lvsdb.2
@@ -129,8 +129,8 @@ layout(
    rect(poly (550 1200) (250 2400))
    rect(poly (-250 -6000) (250 2400))
    rect(poly (-1050 1200) (250 2400))
-   rect(poly_lbl (-526 -2601) (2 2))
-   rect(poly_cont (-831 -111) (220 220))
+   rect(poly_lbl (-525 -2600) (0 0))
+   rect(poly_cont (-830 -110) (220 220))
   )
   net(3 name(OUT)
    rect(diff_cont (-910 90) (220 220))
@@ -156,8 +156,8 @@ layout(
    rect(metal1 (1240 2040) (360 1560))
    rect(metal1 (-360 -5160) (360 1560))
    rect(metal1 (-1960 2040) (360 1560))
-   rect(metal1_lbl (1419 -2181) (2 2))
-   rect(psd (-1851 524) (525 1750))
+   rect(metal1_lbl (1420 -2180) (0 0))
+   rect(psd (-1850 525) (525 1750))
    rect(psd (1050 -1750) (525 1750))
    rect(nsd (-2100 -5350) (525 1750))
    rect(nsd (1050 -1750) (525 1750))
@@ -178,8 +178,8 @@ layout(
    rect(via1 (-250 -1450) (250 250))
    rect(via1 (-250 150) (250 250))
    rect(metal2 (-1525 -775) (2800 1700))
-   rect(metal2_lbl (-161 -541) (2 2))
-   rect(nsd (-1516 -1186) (550 1750))
+   rect(metal2_lbl (-160 -540) (0 0))
+   rect(nsd (-1515 -1185) (550 1750))
   )
   net(5 name(VDD)
    rect(diff_cont (-110 2490) (220 220))
@@ -197,8 +197,8 @@ layout(
    rect(via1 (-250 150) (250 250))
    rect(via1 (-250 150) (250 250))
    rect(metal2 (-1525 -1575) (2800 1700))
-   rect(metal2_lbl (-151 -1251) (2 2))
-   rect(psd (-1526 -476) (550 1750))
+   rect(metal2_lbl (-150 -1250) (0 0))
+   rect(psd (-1525 -475) (550 1750))
   )
   net(6 name(BULK)
    rect(diff_cont (-110 -2160) (220 220))
@@ -313,12 +313,12 @@ layout(
    rect(via1 (-305 -305) (250 250))
    rect(via1 (23190 -250) (250 250))
    rect(metal2 (-23765 -325) (23840 400))
-   rect(metal2_lbl (-22121 -201) (2 2))
+   rect(metal2_lbl (-22120 -200) (0 0))
   )
   net(2 name(OSC)
    rect(via1 (24435 1675) (250 250))
    rect(metal2 (-325 -325) (400 400))
-   rect(metal2_lbl (-201 -201) (2 2))
+   rect(metal2_lbl (-200 -200) (0 0))
   )
   net(3 name(VDD)
    rect(metal1 (-180 3900) (360 1120))
@@ -331,7 +331,7 @@ layout(
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
-   rect(metal2_lbl (-23941 -2221) (2 2))
+   rect(metal2_lbl (-23940 -2220) (0 0))
   )
   net(4 name(VSS)
    rect(metal1 (-180 -2220) (360 1120))
@@ -344,7 +344,7 @@ layout(
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
-   rect(metal2_lbl (-23941 1099) (2 2))
+   rect(metal2_lbl (-23940 1100) (0 0))
   )
   net(5)
   net(6)
diff --git a/testdata/algo/lvs_test2b_au.lvsdb.1 b/testdata/algo/lvs_test2b_au.lvsdb.1
index 47263e0e2..fd107f1b9 100644
--- a/testdata/algo/lvs_test2b_au.lvsdb.1
+++ b/testdata/algo/lvs_test2b_au.lvsdb.1
@@ -129,8 +129,8 @@ layout(
    rect(poly (550 1200) (250 2400))
    rect(poly (-250 -6000) (250 2400))
    rect(poly (-1050 1200) (250 2400))
-   rect(poly_lbl (-526 -2601) (2 2))
-   rect(poly_cont (-831 -111) (220 220))
+   rect(poly_lbl (-525 -2600) (0 0))
+   rect(poly_cont (-830 -110) (220 220))
   )
   net(3 name(OUT)
    rect(diff_cont (-910 90) (220 220))
@@ -156,8 +156,8 @@ layout(
    rect(metal1 (1240 2040) (360 1560))
    rect(metal1 (-360 -5160) (360 1560))
    rect(metal1 (-1960 2040) (360 1560))
-   rect(metal1_lbl (1419 -2181) (2 2))
-   rect(psd (-276 524) (525 1750))
+   rect(metal1_lbl (1420 -2180) (0 0))
+   rect(psd (-275 525) (525 1750))
    rect(psd (-2100 -1750) (525 1750))
    rect(nsd (1050 -5350) (525 1750))
    rect(nsd (-2100 -1750) (525 1750))
@@ -178,8 +178,8 @@ layout(
    rect(via1 (-250 -1450) (250 250))
    rect(via1 (-250 150) (250 250))
    rect(metal2 (-1525 -775) (2800 1700))
-   rect(metal2_lbl (-161 -541) (2 2))
-   rect(nsd (-1516 -1186) (550 1750))
+   rect(metal2_lbl (-160 -540) (0 0))
+   rect(nsd (-1515 -1185) (550 1750))
   )
   net(5 name(VDD)
    rect(diff_cont (-110 2490) (220 220))
@@ -197,8 +197,8 @@ layout(
    rect(via1 (-250 150) (250 250))
    rect(via1 (-250 150) (250 250))
    rect(metal2 (-1525 -1575) (2800 1700))
-   rect(metal2_lbl (-151 -1251) (2 2))
-   rect(psd (-1526 -476) (550 1750))
+   rect(metal2_lbl (-150 -1250) (0 0))
+   rect(psd (-1525 -475) (550 1750))
   )
   net(6 name(BULK)
    rect(diff_cont (-110 -2160) (220 220))
@@ -313,12 +313,12 @@ layout(
    rect(via1 (-305 -305) (250 250))
    rect(via1 (23190 -250) (250 250))
    rect(metal2 (-23765 -325) (23840 400))
-   rect(metal2_lbl (-22121 -201) (2 2))
+   rect(metal2_lbl (-22120 -200) (0 0))
   )
   net(2 name(OSC)
    rect(via1 (24435 1675) (250 250))
    rect(metal2 (-325 -325) (400 400))
-   rect(metal2_lbl (-201 -201) (2 2))
+   rect(metal2_lbl (-200 -200) (0 0))
   )
   net(3 name(VDD)
    rect(metal1 (-180 3900) (360 1120))
@@ -331,7 +331,7 @@ layout(
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
-   rect(metal2_lbl (-23941 -2221) (2 2))
+   rect(metal2_lbl (-23940 -2220) (0 0))
   )
   net(4 name(VSS)
    rect(metal1 (-180 -2220) (360 1120))
@@ -344,7 +344,7 @@ layout(
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
-   rect(metal2_lbl (-23941 1099) (2 2))
+   rect(metal2_lbl (-23940 1100) (0 0))
   )
   net(5)
   net(6)
diff --git a/testdata/algo/lvs_test2b_au.lvsdb.2 b/testdata/algo/lvs_test2b_au.lvsdb.2
index cbe6175f5..29b9a4b7c 100644
--- a/testdata/algo/lvs_test2b_au.lvsdb.2
+++ b/testdata/algo/lvs_test2b_au.lvsdb.2
@@ -129,8 +129,8 @@ layout(
    rect(poly (550 1200) (250 2400))
    rect(poly (-250 -6000) (250 2400))
    rect(poly (-1050 1200) (250 2400))
-   rect(poly_lbl (-526 -2601) (2 2))
-   rect(poly_cont (-831 -111) (220 220))
+   rect(poly_lbl (-525 -2600) (0 0))
+   rect(poly_cont (-830 -110) (220 220))
   )
   net(3 name(OUT)
    rect(diff_cont (-910 90) (220 220))
@@ -156,8 +156,8 @@ layout(
    rect(metal1 (1240 2040) (360 1560))
    rect(metal1 (-360 -5160) (360 1560))
    rect(metal1 (-1960 2040) (360 1560))
-   rect(metal1_lbl (1419 -2181) (2 2))
-   rect(psd (-1851 524) (525 1750))
+   rect(metal1_lbl (1420 -2180) (0 0))
+   rect(psd (-1850 525) (525 1750))
    rect(psd (1050 -1750) (525 1750))
    rect(nsd (-2100 -5350) (525 1750))
    rect(nsd (1050 -1750) (525 1750))
@@ -178,8 +178,8 @@ layout(
    rect(via1 (-250 -1450) (250 250))
    rect(via1 (-250 150) (250 250))
    rect(metal2 (-1525 -775) (2800 1700))
-   rect(metal2_lbl (-161 -541) (2 2))
-   rect(nsd (-1516 -1186) (550 1750))
+   rect(metal2_lbl (-160 -540) (0 0))
+   rect(nsd (-1515 -1185) (550 1750))
   )
   net(5 name(VDD)
    rect(diff_cont (-110 2490) (220 220))
@@ -197,8 +197,8 @@ layout(
    rect(via1 (-250 150) (250 250))
    rect(via1 (-250 150) (250 250))
    rect(metal2 (-1525 -1575) (2800 1700))
-   rect(metal2_lbl (-151 -1251) (2 2))
-   rect(psd (-1526 -476) (550 1750))
+   rect(metal2_lbl (-150 -1250) (0 0))
+   rect(psd (-1525 -475) (550 1750))
   )
   net(6 name(BULK)
    rect(diff_cont (-110 -2160) (220 220))
@@ -313,12 +313,12 @@ layout(
    rect(via1 (-305 -305) (250 250))
    rect(via1 (23190 -250) (250 250))
    rect(metal2 (-23765 -325) (23840 400))
-   rect(metal2_lbl (-22121 -201) (2 2))
+   rect(metal2_lbl (-22120 -200) (0 0))
   )
   net(2 name(OSC)
    rect(via1 (24435 1675) (250 250))
    rect(metal2 (-325 -325) (400 400))
-   rect(metal2_lbl (-201 -201) (2 2))
+   rect(metal2_lbl (-200 -200) (0 0))
   )
   net(3 name(VDD)
    rect(metal1 (-180 3900) (360 1120))
@@ -331,7 +331,7 @@ layout(
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
-   rect(metal2_lbl (-23941 -2221) (2 2))
+   rect(metal2_lbl (-23940 -2220) (0 0))
   )
   net(4 name(VSS)
    rect(metal1 (-180 -2220) (360 1120))
@@ -344,7 +344,7 @@ layout(
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
    rect(metal1 (2280 -1120) (360 1120))
-   rect(metal2_lbl (-23941 1099) (2 2))
+   rect(metal2_lbl (-23940 1100) (0 0))
   )
   net(5)
   net(6)
diff --git a/testdata/algo/lvsdb_read_test.lvsdb b/testdata/algo/lvsdb_read_test.lvsdb
index 58faa611b..dd2512b13 100644
--- a/testdata/algo/lvsdb_read_test.lvsdb
+++ b/testdata/algo/lvsdb_read_test.lvsdb
@@ -129,8 +129,8 @@ layout(
    rect(poly (550 1200) (250 2400))
    rect(poly (-250 -6000) (250 2400))
    rect(poly (-1050 1200) (250 2400))
-   rect(poly_lbl (-526 -2601) (2 2))
-   rect(poly_cont (-831 -111) (220 220))
+   rect(poly_lbl (-525 -2600) (0 0))
+   rect(poly_cont (-830 -110) (220 220))
   )
   net(3 name(OUT)
    rect(diff_cont (-910 90) (220 220))
@@ -156,8 +156,8 @@ layout(
    rect(metal1 (1240 2040) (360 1560))
    rect(metal1 (-360 -5160) (360 1560))
    rect(metal1 (-1960 2040) (360 1560))
-   rect(metal1_lbl (1419 -2181) (2 2))
-   rect(psd (-276 524) (525 1750))
+   rect(metal1_lbl (1420 -2180) (0 0))
+   rect(psd (-275 525) (525 1750))
    rect(psd (-2100 -1750) (525 1750))
    rect(nsd (1050 -5350) (525 1750))
    rect(nsd (-2100 -1750) (525 1750))
@@ -178,8 +178,8 @@ layout(
    rect(via1 (-250 -1450) (250 250))
    rect(via1 (-250 150) (250 250))
    rect(metal2 (-1525 -775) (2800 1700))
-   rect(metal2_lbl (-161 -541) (2 2))
-   rect(nsd (-1516 -1186) (550 1750))
+   rect(metal2_lbl (-160 -540) (0 0))
+   rect(nsd (-1515 -1185) (550 1750))
   )
   net(5 name(VDD)
    rect(diff_cont (-110 2490) (220 220))
@@ -197,8 +197,8 @@ layout(
    rect(via1 (-250 150) (250 250))
    rect(via1 (-250 150) (250 250))
    rect(metal2 (-1525 -1575) (2800 1700))
-   rect(metal2_lbl (-151 -1251) (2 2))
-   rect(psd (-1526 -476) (550 1750))
+   rect(metal2_lbl (-150 -1250) (0 0))
+   rect(psd (-1525 -475) (550 1750))
   )
   net(6 name(BULK)
    rect(diff_cont (-110 -2160) (220 220))
@@ -405,7 +405,7 @@ layout(
    rect(via1 (-305 -305) (250 250))
    rect(via1 (23190 -250) (250 250))
    rect(metal2 (-23765 -325) (23840 400))
-   rect(metal2_lbl (-22121 -201) (2 2))
+   rect(metal2_lbl (-22120 -200) (0 0))
   )
   net(2 name(OSC)
    rect(diff_cont (22850 90) (220 220))
@@ -426,7 +426,7 @@ layout(
    rect(diff_cont (-220 180) (220 220))
    rect(via1 (1365 -2235) (250 250))
    rect(metal2 (-325 -325) (400 400))
-   rect(metal2_lbl (-201 -201) (2 2))
+   rect(metal2_lbl (-200 -200) (0 0))
   )
   net(3 name(VDD)
    rect(diff_cont (7810 2490) (220 220))
@@ -539,7 +539,7 @@ layout(
    rect(metal1 (-360 -1560) (360 1560))
    rect(metal1 (-3000 -1560) (360 1560))
    rect(metal1 (-360 -1560) (360 1560))
-   rect(metal2_lbl (-21301 -1181) (2 2))
+   rect(metal2_lbl (-21300 -1180) (0 0))
   )
   net(4 name(VSS)
    rect(diff_cont (7810 90) (220 220))
@@ -652,7 +652,7 @@ layout(
    rect(metal1 (-360 -1560) (360 1560))
    rect(metal1 (-3000 -1560) (360 1560))
    rect(metal1 (-360 -1560) (360 1560))
-   rect(metal2_lbl (-21301 -381) (2 2))
+   rect(metal2_lbl (-21300 -380) (0 0))
   )
   net(5
    rect(diff_cont (1730 90) (220 220))
diff --git a/testdata/algo/lvsdb_read_test2.lvsdb b/testdata/algo/lvsdb_read_test2.lvsdb
index e1a8825f8..5192ffaba 100644
--- a/testdata/algo/lvsdb_read_test2.lvsdb
+++ b/testdata/algo/lvsdb_read_test2.lvsdb
@@ -129,8 +129,8 @@ layout(
    rect(poly (550 1200) (250 2400))
    rect(poly (-250 -6000) (250 2400))
    rect(poly (-1050 1200) (250 2400))
-   rect(poly_lbl (-526 -2601) (2 2))
-   rect(poly_cont (-831 -111) (220 220))
+   rect(poly_lbl (-525 -2600) (0 0))
+   rect(poly_cont (-830 -110) (220 220))
   )
   net(3 name(OUT)
    rect(diff_cont (-910 90) (220 220))
@@ -156,8 +156,8 @@ layout(
    rect(metal1 (1240 2040) (360 1560))
    rect(metal1 (-360 -5160) (360 1560))
    rect(metal1 (-1960 2040) (360 1560))
-   rect(metal1_lbl (1419 -2181) (2 2))
-   rect(psd (-276 524) (525 1750))
+   rect(metal1_lbl (1420 -2180) (0 0))
+   rect(psd (-275 525) (525 1750))
    rect(psd (-2100 -1750) (525 1750))
    rect(nsd (1050 -5350) (525 1750))
    rect(nsd (-2100 -1750) (525 1750))
@@ -178,8 +178,8 @@ layout(
    rect(via1 (-250 -1450) (250 250))
    rect(via1 (-250 150) (250 250))
    rect(metal2 (-1525 -775) (2800 1700))
-   rect(metal2_lbl (-161 -541) (2 2))
-   rect(nsd (-1516 -1186) (550 1750))
+   rect(metal2_lbl (-160 -540) (0 0))
+   rect(nsd (-1515 -1185) (550 1750))
   )
   net(5 name(VDD)
    rect(diff_cont (-110 2490) (220 220))
@@ -197,8 +197,8 @@ layout(
    rect(via1 (-250 150) (250 250))
    rect(via1 (-250 150) (250 250))
    rect(metal2 (-1525 -1575) (2800 1700))
-   rect(metal2_lbl (-151 -1251) (2 2))
-   rect(psd (-1526 -476) (550 1750))
+   rect(metal2_lbl (-150 -1250) (0 0))
+   rect(psd (-1525 -475) (550 1750))
   )
   net(6 name(BULK)
    rect(diff_cont (-110 -2160) (220 220))
@@ -405,7 +405,7 @@ layout(
    rect(via1 (-305 -305) (250 250))
    rect(via1 (23190 -250) (250 250))
    rect(metal2 (-23765 -325) (23840 400))
-   rect(metal2_lbl (-22121 -201) (2 2))
+   rect(metal2_lbl (-22120 -200) (0 0))
   )
   net(2 name(OSC)
    rect(diff_cont (22850 90) (220 220))
@@ -426,7 +426,7 @@ layout(
    rect(diff_cont (-220 180) (220 220))
    rect(via1 (1365 -2235) (250 250))
    rect(metal2 (-325 -325) (400 400))
-   rect(metal2_lbl (-201 -201) (2 2))
+   rect(metal2_lbl (-200 -200) (0 0))
   )
   net(3 name(VDD)
    rect(diff_cont (7810 2490) (220 220))
@@ -539,7 +539,7 @@ layout(
    rect(metal1 (-360 -1560) (360 1560))
    rect(metal1 (-3000 -1560) (360 1560))
    rect(metal1 (-360 -1560) (360 1560))
-   rect(metal2_lbl (-21301 -1181) (2 2))
+   rect(metal2_lbl (-21300 -1180) (0 0))
   )
   net(4 name(VSS)
    rect(diff_cont (7810 90) (220 220))
@@ -652,7 +652,7 @@ layout(
    rect(metal1 (-360 -1560) (360 1560))
    rect(metal1 (-3000 -1560) (360 1560))
    rect(metal1 (-360 -1560) (360 1560))
-   rect(metal2_lbl (-21301 -381) (2 2))
+   rect(metal2_lbl (-21300 -380) (0 0))
   )
   net(5
    rect(diff_cont (1730 90) (220 220))
diff --git a/testdata/lvs/test_22a.cir b/testdata/lvs/test_22a.cir
index ab888a3c8..4758e7241 100644
--- a/testdata/lvs/test_22a.cir
+++ b/testdata/lvs/test_22a.cir
@@ -48,7 +48,7 @@ M$10 4 31 35 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
 M$11 34 32 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
 + AD=0.0588P PS=1.285U PD=0.7U
 * device instance $12 r0 *1 2.395,3.615 sky130_fd_pr__nfet_01v8__model
-M$12 35 37 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
+M$12 35 47 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
 + AD=0.0588P PS=1.285U PD=0.7U
 * device instance $13 r0 *1 4.145,1.935 sky130_fd_pr__nfet_01v8__model
 M$13 15 16 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
@@ -63,16 +63,16 @@ M$15 15 26 5 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
 M$16 20 26 6 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
 + AD=0.0588P PS=1.285U PD=0.7U
 * device instance $17 r0 *1 3.755,2.99 sky130_fd_pr__nfet_01v8__model
-M$17 5 31 37 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
+M$17 5 31 47 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
 + AD=0.18165P PS=0.7U PD=1.285U
 * device instance $18 r0 *1 4.965,2.99 sky130_fd_pr__nfet_01v8__model
-M$18 6 31 38 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
+M$18 6 31 37 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
 + AD=0.18165P PS=0.7U PD=1.285U
 * device instance $19 r0 *1 4.145,3.615 sky130_fd_pr__nfet_01v8__model
-M$19 37 35 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
+M$19 47 35 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
 + AD=0.0588P PS=1.285U PD=0.7U
 * device instance $20 r0 *1 4.575,3.615 sky130_fd_pr__nfet_01v8__model
-M$20 38 40 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
+M$20 37 49 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
 + AD=0.0588P PS=1.285U PD=0.7U
 * device instance $21 r0 *1 6.325,1.935 sky130_fd_pr__nfet_01v8__model
 M$21 19 20 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
@@ -87,16 +87,16 @@ M$23 19 26 7 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
 M$24 24 26 8 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
 + AD=0.0588P PS=1.285U PD=0.7U
 * device instance $25 r0 *1 5.935,2.99 sky130_fd_pr__nfet_01v8__model
-M$25 7 31 40 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
+M$25 7 31 49 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
 + AD=0.18165P PS=0.7U PD=1.285U
 * device instance $26 r0 *1 7.145,2.99 sky130_fd_pr__nfet_01v8__model
-M$26 8 31 41 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
+M$26 8 31 39 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
 + AD=0.18165P PS=0.7U PD=1.285U
 * device instance $27 r0 *1 6.325,3.615 sky130_fd_pr__nfet_01v8__model
-M$27 40 38 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
+M$27 49 37 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
 + AD=0.0588P PS=1.285U PD=0.7U
 * device instance $28 r0 *1 6.755,3.615 sky130_fd_pr__nfet_01v8__model
-M$28 41 50 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
+M$28 39 50 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
 + AD=0.0588P PS=1.285U PD=0.7U
 * device instance $29 r0 *1 8.505,1.935 sky130_fd_pr__nfet_01v8__model
 M$29 23 24 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
@@ -108,7 +108,7 @@ M$30 23 26 9 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
 M$31 9 31 50 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
 + AD=0.18165P PS=0.7U PD=1.285U
 * device instance $32 r0 *1 8.505,3.615 sky130_fd_pr__nfet_01v8__model
-M$32 50 41 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
+M$32 50 39 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
 + AD=0.1113P PS=1.285U PD=1.37U
 * device instance $33 r0 *1 0.215,0.605 sky130_fd_pr__pfet_01v8__model
 M$33 1 11 12 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1113P
@@ -141,21 +141,21 @@ M$41 1 34 32 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1113P
 M$42 34 32 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
 + AD=0.0588P PS=1.73U PD=0.7U
 * device instance $43 r0 *1 2.395,4.945 sky130_fd_pr__pfet_01v8__model
-M$43 1 37 35 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.0588P
+M$43 1 47 35 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.0588P
 + AD=0.1869P PS=0.7U PD=1.73U
 * device instance $44 r0 *1 4.145,4.945 sky130_fd_pr__pfet_01v8__model
-M$44 37 35 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
+M$44 47 35 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
 + AD=0.0588P PS=1.73U PD=0.7U
 * device instance $45 r0 *1 4.575,4.945 sky130_fd_pr__pfet_01v8__model
-M$45 1 40 38 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.0588P
+M$45 1 49 37 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.0588P
 + AD=0.1869P PS=0.7U PD=1.73U
 * device instance $46 r0 *1 6.325,4.945 sky130_fd_pr__pfet_01v8__model
-M$46 40 38 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
+M$46 49 37 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
 + AD=0.0588P PS=1.73U PD=0.7U
 * device instance $47 r0 *1 6.755,4.945 sky130_fd_pr__pfet_01v8__model
-M$47 1 50 41 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.0588P
+M$47 1 50 39 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.0588P
 + AD=0.1869P PS=0.7U PD=1.73U
 * device instance $48 r0 *1 8.505,4.945 sky130_fd_pr__pfet_01v8__model
-M$48 50 41 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
+M$48 50 39 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
 + AD=0.1113P PS=1.73U PD=1.37U
 .ENDS SP6TArray_2X4
diff --git a/testdata/lvs/test_22a.lvsdb b/testdata/lvs/test_22a.lvsdb
index 9b9dfdd14..1d74871c2 100644
--- a/testdata/lvs/test_22a.lvsdb
+++ b/testdata/lvs/test_22a.lvsdb
@@ -516,16 +516,16 @@ layout(
    rect(l2 (1365 2635) (420 280))
    polygon(l9 (-295 -305) (0 330) (170 0) (0 -80) (60 0) (0 -170) (-60 0) (0 -80))
    polygon(l9 (-170 0) (0 330) (170 0) (0 -80) (60 0) (0 -170) (-60 0) (0 -80))
-   rect(l11 (-140 -2610) (230 2920))
-   rect(l11 (-230 -2920) (230 5550))
+   rect(l11 (-140 -2610) (230 5550))
    rect(l11 (-230 -5550) (230 5550))
    rect(l11 (-230 -5550) (230 5550))
-   rect(l11 (-230 -2920) (230 2920))
+   rect(l11 (-230 -5550) (230 2920))
+   rect(l11 (-230 -290) (230 2920))
+   rect(l12 (-230 -5550) (230 5550))
    rect(l12 (-230 -5550) (230 5550))
    rect(l12 (-230 -5550) (230 5550))
    rect(l12 (-230 -5550) (230 2920))
-   rect(l12 (-230 -2920) (230 5550))
-   rect(l12 (-230 -2920) (230 2920))
+   rect(l12 (-230 -290) (230 2920))
    rect(l12 (-115 -2775) (0 0))
    rect(l21 (-145 -85) (170 170))
    rect(l21 (-170 -170) (170 170))
@@ -541,11 +541,11 @@ layout(
    rect(l11 (-230 -5550) (230 2920))
    rect(l11 (-230 -2920) (230 5550))
    rect(l11 (-230 -2920) (230 2920))
-   rect(l12 (-230 -5550) (230 5550))
-   rect(l12 (-230 -5550) (230 5550))
-   rect(l12 (-230 -5550) (230 5550))
    rect(l12 (-230 -5550) (230 2920))
-   rect(l12 (-230 -290) (230 2920))
+   rect(l12 (-230 -2920) (230 5550))
+   rect(l12 (-230 -5550) (230 5550))
+   rect(l12 (-230 -5550) (230 5550))
+   rect(l12 (-230 -2920) (230 2920))
    rect(l12 (-115 -2775) (0 0))
    rect(l21 (-25 -85) (170 170))
    rect(l21 (-170 -170) (170 170))
@@ -556,16 +556,16 @@ layout(
    rect(l2 (3545 2635) (420 280))
    polygon(l9 (-295 -305) (0 330) (170 0) (0 -80) (60 0) (0 -170) (-60 0) (0 -80))
    polygon(l9 (-170 0) (0 330) (170 0) (0 -80) (60 0) (0 -170) (-60 0) (0 -80))
-   rect(l11 (-140 -2610) (230 5550))
-   rect(l11 (-230 -5550) (230 5550))
-   rect(l11 (-230 -5550) (230 2920))
+   rect(l11 (-140 -2610) (230 2920))
    rect(l11 (-230 -2920) (230 5550))
+   rect(l11 (-230 -5550) (230 5550))
+   rect(l11 (-230 -5550) (230 5550))
    rect(l11 (-230 -2920) (230 2920))
    rect(l12 (-230 -5550) (230 5550))
-   rect(l12 (-230 -5550) (230 2920))
-   rect(l12 (-230 -2920) (230 5550))
    rect(l12 (-230 -5550) (230 5550))
-   rect(l12 (-230 -2920) (230 2920))
+   rect(l12 (-230 -5550) (230 5550))
+   rect(l12 (-230 -5550) (230 2920))
+   rect(l12 (-230 -290) (230 2920))
    rect(l12 (-115 -2775) (0 0))
    rect(l21 (-145 -85) (170 170))
    rect(l21 (-170 -170) (170 170))
@@ -576,15 +576,15 @@ layout(
    rect(l2 (4755 2635) (420 280))
    polygon(l9 (-295 -305) (0 80) (-60 0) (0 170) (60 0) (0 80) (170 0) (0 -330))
    polygon(l9 (-170 0) (0 80) (-60 0) (0 170) (60 0) (0 80) (170 0) (0 -330))
-   rect(l11 (-260 -2610) (230 5550))
-   rect(l11 (-230 -5550) (230 5550))
-   rect(l11 (-230 -5550) (230 2920))
+   rect(l11 (-260 -2610) (230 2920))
    rect(l11 (-230 -2920) (230 5550))
+   rect(l11 (-230 -5550) (230 5550))
+   rect(l11 (-230 -5550) (230 5550))
    rect(l11 (-230 -2920) (230 2920))
    rect(l12 (-230 -5550) (230 5550))
+   rect(l12 (-230 -5550) (230 5550))
    rect(l12 (-230 -5550) (230 2920))
    rect(l12 (-230 -2920) (230 5550))
-   rect(l12 (-230 -5550) (230 5550))
    rect(l12 (-230 -2920) (230 2920))
    rect(l12 (-115 -2775) (0 0))
    rect(l21 (-25 -85) (170 170))
@@ -596,15 +596,15 @@ layout(
    rect(l2 (5725 2635) (420 280))
    polygon(l9 (-295 -305) (0 330) (170 0) (0 -80) (60 0) (0 -170) (-60 0) (0 -80))
    polygon(l9 (-170 0) (0 330) (170 0) (0 -80) (60 0) (0 -170) (-60 0) (0 -80))
-   rect(l11 (-140 -2610) (230 5550))
-   rect(l11 (-230 -5550) (230 5550))
-   rect(l11 (-230 -5550) (230 2920))
+   rect(l11 (-140 -2610) (230 2920))
    rect(l11 (-230 -2920) (230 5550))
+   rect(l11 (-230 -5550) (230 5550))
+   rect(l11 (-230 -5550) (230 5550))
    rect(l11 (-230 -2920) (230 2920))
-   rect(l12 (-230 -5550) (230 5550))
    rect(l12 (-230 -5550) (230 2920))
    rect(l12 (-230 -2920) (230 5550))
    rect(l12 (-230 -5550) (230 5550))
+   rect(l12 (-230 -5550) (230 5550))
    rect(l12 (-230 -2920) (230 2920))
    rect(l12 (-115 -2775) (0 0))
    rect(l21 (-145 -85) (170 170))
@@ -636,15 +636,15 @@ layout(
    rect(l2 (7905 2635) (420 280))
    polygon(l9 (-295 -305) (0 330) (170 0) (0 -80) (60 0) (0 -170) (-60 0) (0 -80))
    polygon(l9 (-170 0) (0 330) (170 0) (0 -80) (60 0) (0 -170) (-60 0) (0 -80))
-   rect(l11 (-140 -2610) (230 2920))
+   rect(l11 (-140 -2610) (230 5550))
+   rect(l11 (-230 -5550) (230 2920))
    rect(l11 (-230 -2920) (230 5550))
    rect(l11 (-230 -5550) (230 5550))
-   rect(l11 (-230 -5550) (230 5550))
    rect(l11 (-230 -2920) (230 2920))
+   rect(l12 (-230 -5550) (230 5550))
    rect(l12 (-230 -5550) (230 2920))
    rect(l12 (-230 -2920) (230 5550))
    rect(l12 (-230 -5550) (230 5550))
-   rect(l12 (-230 -5550) (230 5550))
    rect(l12 (-230 -2920) (230 2920))
    rect(l12 (-115 -2775) (0 0))
    rect(l21 (-145 -85) (170 170))
@@ -690,23 +690,23 @@ layout(
    rect(l7 (950 -1320) (330 270))
   )
   net(15
-   rect(l2 (3625 395) (445 420))
-   polygon(l2 (-525 910) (0 760) (420 0) (0 -340) (105 0) (0 -420))
-   polygon(l9 (-405 -1280) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
+   polygon(l2 (3545 1725) (0 760) (420 0) (0 -340) (105 0) (0 -420))
+   rect(l2 (-445 -1330) (445 420))
+   polygon(l9 (-405 -370) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
    rect(l21 (-335 560) (170 170))
-   rect(l21 (-5 -650) (170 170))
-   rect(l21 (-170 1070) (170 170))
-   rect(l22 (-1365 -980) (950 150))
+   rect(l21 (-5 590) (170 170))
+   rect(l21 (-170 -1410) (170 170))
+   rect(l22 (-1365 260) (950 150))
    rect(l22 (-1100 -840) (150 2010))
    rect(l22 (950 -1320) (330 270))
   )
   net(16
-   polygon(l2 (2470 1725) (0 420) (105 0) (0 340) (420 0) (0 -760))
-   rect(l2 (-525 -1330) (445 420))
-   polygon(l9 (-210 -370) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
-   rect(l21 (-170 1320) (170 170))
-   rect(l21 (-170 -1410) (170 170))
-   rect(l21 (-5 670) (170 170))
+   rect(l2 (2470 395) (445 420))
+   polygon(l2 (-445 910) (0 420) (105 0) (0 340) (420 0) (0 -760))
+   polygon(l9 (-290 -1280) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
+   rect(l21 (-170 80) (170 170))
+   rect(l21 (-170 1070) (170 170))
+   rect(l21 (-5 -570) (170 170))
    rect(l22 (-250 -220) (330 270))
    rect(l22 (0 -150) (950 150))
    rect(l22 (0 -1320) (150 2010))
@@ -850,22 +850,22 @@ layout(
    polygon(l11 (1950 0) (0 290) (-15 0) (0 320) (260 0) (0 -320) (-15 0) (0 -290))
    polygon(l11 (1950 0) (0 290) (-15 0) (0 320) (260 0) (0 -320) (-15 0) (0 -290))
    polygon(l11 (1950 0) (0 290) (-15 0) (0 320) (260 0) (0 -320) (-15 0) (0 -290))
-   rect(l13 (-7745 320) (8720 260))
+   rect(l13 (-7745 320) (2180 260))
+   rect(l13 (-2180 -260) (2180 260))
+   rect(l13 (-2180 -260) (8720 260))
    rect(l13 (-8720 -260) (4360 260))
-   rect(l13 (-4360 -260) (2180 260))
+   rect(l13 (-2180 -260) (2180 260))
    rect(l13 (-2180 -260) (2180 260))
    rect(l13 (0 -260) (2180 260))
    rect(l13 (-2180 -260) (2180 260))
-   rect(l13 (0 -260) (4360 260))
-   rect(l13 (-4360 -260) (2180 260))
+   rect(l13 (-2180 -260) (4360 260))
    rect(l13 (-2180 -260) (2180 260))
-   rect(l13 (0 -260) (2180 260))
    rect(l13 (-2180 -260) (2180 260))
-   rect(l14 (-8720 -260) (8720 260))
-   rect(l14 (-8720 -260) (2180 260))
-   rect(l14 (-2180 -260) (4360 260))
+   rect(l14 (-8720 -260) (4360 260))
    rect(l14 (-4360 -260) (2180 260))
-   rect(l14 (0 -260) (2180 260))
+   rect(l14 (-2180 -260) (2180 260))
+   rect(l14 (-2180 -260) (8720 260))
+   rect(l14 (-6540 -260) (2180 260))
    rect(l14 (-2180 -260) (2180 260))
    rect(l14 (0 -130) (0 0))
    rect(l14 (0 -130) (2180 260))
@@ -934,17 +934,6 @@ layout(
    rect(l7 (950 -960) (150 2010))
   )
   net(37
-   polygon(l2 (3545 3065) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
-   rect(l2 (-340 1670) (445 420))
-   polygon(l9 (-405 -1620) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
-   rect(l21 (-170 80) (170 170))
-   rect(l21 (-335 590) (170 170))
-   rect(l21 (-5 310) (170 170))
-   rect(l22 (-1365 -580) (950 150))
-   rect(l22 (-1100 -1320) (150 2010))
-   rect(l22 (950 -960) (330 270))
-  )
-  net(38
    polygon(l2 (4755 3065) (0 340) (-105 0) (0 420) (525 0) (0 -760))
    rect(l2 (-525 1670) (445 420))
    polygon(l9 (-210 -1620) (0 1570) (170 0) (0 -920) (245 0) (0 -170) (-245 0) (0 -480))
@@ -955,23 +944,12 @@ layout(
    rect(l22 (0 -270) (950 150))
    rect(l22 (0 -840) (150 2010))
   )
-  net(39
+  net(38
    rect(l7 (5300 3965) (950 150))
    rect(l7 (-1280 -150) (330 270))
    rect(l7 (950 -960) (150 2010))
   )
-  net(40
-   polygon(l2 (5725 3065) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
-   rect(l2 (-340 1670) (445 420))
-   polygon(l9 (-405 -1620) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
-   rect(l21 (-170 80) (170 170))
-   rect(l21 (-335 590) (170 170))
-   rect(l21 (-5 310) (170 170))
-   rect(l22 (-1365 -580) (950 150))
-   rect(l22 (-1100 -1320) (150 2010))
-   rect(l22 (950 -960) (330 270))
-  )
-  net(41
+  net(39
    polygon(l2 (6935 3065) (0 340) (-105 0) (0 420) (525 0) (0 -760))
    rect(l2 (-525 1670) (445 420))
    polygon(l9 (-210 -1620) (0 1570) (170 0) (0 -920) (245 0) (0 -170) (-245 0) (0 -480))
@@ -982,38 +960,60 @@ layout(
    rect(l22 (0 -270) (950 150))
    rect(l22 (0 -840) (150 2010))
   )
-  net(42
+  net(40
    rect(l7 (7480 3965) (950 150))
    rect(l7 (-1280 -150) (330 270))
    rect(l7 (950 -960) (150 2010))
   )
-  net(43
+  net(41
    polygon(l7 (265 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
-  net(44
+  net(42
    polygon(l7 (6805 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
-  net(45
+  net(43
    polygon(l7 (2445 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
-  net(46
+  net(44
    polygon(l7 (4625 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
-  net(47
+  net(45
    rect(l7 (290 4445) (950 150))
    rect(l7 (-1100 -1320) (150 2010))
    rect(l7 (950 -960) (330 270))
   )
-  net(48
+  net(46
    rect(l7 (2470 4445) (950 150))
    rect(l7 (-1100 -1320) (150 2010))
    rect(l7 (950 -960) (330 270))
   )
-  net(49
+  net(47
+   polygon(l2 (3545 3065) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
+   rect(l2 (-340 1670) (445 420))
+   polygon(l9 (-405 -1620) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
+   rect(l21 (-335 840) (170 170))
+   rect(l21 (-5 -930) (170 170))
+   rect(l21 (-170 1070) (170 170))
+   rect(l22 (-1365 -580) (950 150))
+   rect(l22 (-1100 -1320) (150 2010))
+   rect(l22 (950 -960) (330 270))
+  )
+  net(48
    rect(l7 (4650 4445) (950 150))
    rect(l7 (-1100 -1320) (150 2010))
    rect(l7 (950 -960) (330 270))
   )
+  net(49
+   polygon(l2 (5725 3065) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
+   rect(l2 (-340 1670) (445 420))
+   polygon(l9 (-405 -1620) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
+   rect(l21 (-335 840) (170 170))
+   rect(l21 (-5 -930) (170 170))
+   rect(l21 (-170 1070) (170 170))
+   rect(l22 (-1365 -580) (950 150))
+   rect(l22 (-1100 -1320) (150 2010))
+   rect(l22 (950 -960) (330 270))
+  )
   net(50
    polygon(l2 (7905 3065) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
    rect(l2 (-340 1670) (445 420))
@@ -1333,7 +1333,7 @@ layout(
    param(PS 1.285)
    param(PD 0.7)
    terminal(S 35)
-   terminal(G 37)
+   terminal(G 47)
    terminal(D 52)
    terminal(B 52)
   )
@@ -1399,7 +1399,7 @@ layout(
    param(PD 1.285)
    terminal(S 5)
    terminal(G 31)
-   terminal(D 37)
+   terminal(D 47)
    terminal(B 52)
   )
   device(18 D$sky130_fd_pr__nfet_01v8__model$2
@@ -1412,7 +1412,7 @@ layout(
    param(PD 1.285)
    terminal(S 6)
    terminal(G 31)
-   terminal(D 38)
+   terminal(D 37)
    terminal(B 52)
   )
   device(19 D$sky130_fd_pr__nfet_01v8__model$8
@@ -1423,7 +1423,7 @@ layout(
    param(AD 0.0588)
    param(PS 1.285)
    param(PD 0.7)
-   terminal(S 37)
+   terminal(S 47)
    terminal(G 35)
    terminal(D 52)
    terminal(B 52)
@@ -1436,8 +1436,8 @@ layout(
    param(AD 0.0588)
    param(PS 1.285)
    param(PD 0.7)
-   terminal(S 38)
-   terminal(G 40)
+   terminal(S 37)
+   terminal(G 49)
    terminal(D 52)
    terminal(B 52)
   )
@@ -1503,7 +1503,7 @@ layout(
    param(PD 1.285)
    terminal(S 7)
    terminal(G 31)
-   terminal(D 40)
+   terminal(D 49)
    terminal(B 52)
   )
   device(26 D$sky130_fd_pr__nfet_01v8__model$2
@@ -1516,7 +1516,7 @@ layout(
    param(PD 1.285)
    terminal(S 8)
    terminal(G 31)
-   terminal(D 41)
+   terminal(D 39)
    terminal(B 52)
   )
   device(27 D$sky130_fd_pr__nfet_01v8__model$8
@@ -1527,8 +1527,8 @@ layout(
    param(AD 0.0588)
    param(PS 1.285)
    param(PD 0.7)
-   terminal(S 40)
-   terminal(G 38)
+   terminal(S 49)
+   terminal(G 37)
    terminal(D 52)
    terminal(B 52)
   )
@@ -1540,7 +1540,7 @@ layout(
    param(AD 0.0588)
    param(PS 1.285)
    param(PD 0.7)
-   terminal(S 41)
+   terminal(S 39)
    terminal(G 50)
    terminal(D 52)
    terminal(B 52)
@@ -1593,7 +1593,7 @@ layout(
    param(PS 1.285)
    param(PD 1.37)
    terminal(S 50)
-   terminal(G 41)
+   terminal(G 39)
    terminal(D 52)
    terminal(B 52)
   )
@@ -1736,7 +1736,7 @@ layout(
    param(PS 0.7)
    param(PD 1.73)
    terminal(S 1)
-   terminal(G 37)
+   terminal(G 47)
    terminal(D 35)
    terminal(B 1)
   )
@@ -1748,7 +1748,7 @@ layout(
    param(AD 0.0588)
    param(PS 1.73)
    param(PD 0.7)
-   terminal(S 37)
+   terminal(S 47)
    terminal(G 35)
    terminal(D 1)
    terminal(B 1)
@@ -1762,8 +1762,8 @@ layout(
    param(PS 0.7)
    param(PD 1.73)
    terminal(S 1)
-   terminal(G 40)
-   terminal(D 38)
+   terminal(G 49)
+   terminal(D 37)
    terminal(B 1)
   )
   device(46 D$sky130_fd_pr__pfet_01v8__model$1
@@ -1774,8 +1774,8 @@ layout(
    param(AD 0.0588)
    param(PS 1.73)
    param(PD 0.7)
-   terminal(S 40)
-   terminal(G 38)
+   terminal(S 49)
+   terminal(G 37)
    terminal(D 1)
    terminal(B 1)
   )
@@ -1789,7 +1789,7 @@ layout(
    param(PD 1.73)
    terminal(S 1)
    terminal(G 50)
-   terminal(D 41)
+   terminal(D 39)
    terminal(B 1)
   )
   device(48 D$sky130_fd_pr__pfet_01v8__model$3
@@ -1801,7 +1801,7 @@ layout(
    param(PS 1.73)
    param(PD 1.37)
    terminal(S 50)
-   terminal(G 41)
+   terminal(G 39)
    terminal(D 1)
    terminal(B 1)
   )
@@ -2503,16 +2503,16 @@ xref(
    net(32 15 match)
    net(15 18 warning)
    net(16 17 warning)
-   net(37 20 match)
+   net(47 20 match)
    net(35 19 match)
    net(19 22 warning)
    net(20 21 warning)
-   net(40 24 match)
-   net(38 23 match)
+   net(49 24 match)
+   net(37 23 match)
    net(23 26 warning)
    net(24 25 warning)
    net(50 28 match)
-   net(41 27 match)
+   net(39 27 match)
    net(2 6 match)
    net(4 8 match)
    net(6 10 match)
diff --git a/testdata/lvs/test_22b.cir b/testdata/lvs/test_22b.cir
index ab888a3c8..4758e7241 100644
--- a/testdata/lvs/test_22b.cir
+++ b/testdata/lvs/test_22b.cir
@@ -48,7 +48,7 @@ M$10 4 31 35 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
 M$11 34 32 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
 + AD=0.0588P PS=1.285U PD=0.7U
 * device instance $12 r0 *1 2.395,3.615 sky130_fd_pr__nfet_01v8__model
-M$12 35 37 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
+M$12 35 47 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
 + AD=0.0588P PS=1.285U PD=0.7U
 * device instance $13 r0 *1 4.145,1.935 sky130_fd_pr__nfet_01v8__model
 M$13 15 16 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
@@ -63,16 +63,16 @@ M$15 15 26 5 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
 M$16 20 26 6 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
 + AD=0.0588P PS=1.285U PD=0.7U
 * device instance $17 r0 *1 3.755,2.99 sky130_fd_pr__nfet_01v8__model
-M$17 5 31 37 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
+M$17 5 31 47 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
 + AD=0.18165P PS=0.7U PD=1.285U
 * device instance $18 r0 *1 4.965,2.99 sky130_fd_pr__nfet_01v8__model
-M$18 6 31 38 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
+M$18 6 31 37 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
 + AD=0.18165P PS=0.7U PD=1.285U
 * device instance $19 r0 *1 4.145,3.615 sky130_fd_pr__nfet_01v8__model
-M$19 37 35 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
+M$19 47 35 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
 + AD=0.0588P PS=1.285U PD=0.7U
 * device instance $20 r0 *1 4.575,3.615 sky130_fd_pr__nfet_01v8__model
-M$20 38 40 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
+M$20 37 49 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
 + AD=0.0588P PS=1.285U PD=0.7U
 * device instance $21 r0 *1 6.325,1.935 sky130_fd_pr__nfet_01v8__model
 M$21 19 20 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
@@ -87,16 +87,16 @@ M$23 19 26 7 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
 M$24 24 26 8 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
 + AD=0.0588P PS=1.285U PD=0.7U
 * device instance $25 r0 *1 5.935,2.99 sky130_fd_pr__nfet_01v8__model
-M$25 7 31 40 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
+M$25 7 31 49 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
 + AD=0.18165P PS=0.7U PD=1.285U
 * device instance $26 r0 *1 7.145,2.99 sky130_fd_pr__nfet_01v8__model
-M$26 8 31 41 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
+M$26 8 31 39 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
 + AD=0.18165P PS=0.7U PD=1.285U
 * device instance $27 r0 *1 6.325,3.615 sky130_fd_pr__nfet_01v8__model
-M$27 40 38 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
+M$27 49 37 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
 + AD=0.0588P PS=1.285U PD=0.7U
 * device instance $28 r0 *1 6.755,3.615 sky130_fd_pr__nfet_01v8__model
-M$28 41 50 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
+M$28 39 50 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
 + AD=0.0588P PS=1.285U PD=0.7U
 * device instance $29 r0 *1 8.505,1.935 sky130_fd_pr__nfet_01v8__model
 M$29 23 24 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
@@ -108,7 +108,7 @@ M$30 23 26 9 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
 M$31 9 31 50 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
 + AD=0.18165P PS=0.7U PD=1.285U
 * device instance $32 r0 *1 8.505,3.615 sky130_fd_pr__nfet_01v8__model
-M$32 50 41 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
+M$32 50 39 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
 + AD=0.1113P PS=1.285U PD=1.37U
 * device instance $33 r0 *1 0.215,0.605 sky130_fd_pr__pfet_01v8__model
 M$33 1 11 12 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1113P
@@ -141,21 +141,21 @@ M$41 1 34 32 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1113P
 M$42 34 32 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
 + AD=0.0588P PS=1.73U PD=0.7U
 * device instance $43 r0 *1 2.395,4.945 sky130_fd_pr__pfet_01v8__model
-M$43 1 37 35 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.0588P
+M$43 1 47 35 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.0588P
 + AD=0.1869P PS=0.7U PD=1.73U
 * device instance $44 r0 *1 4.145,4.945 sky130_fd_pr__pfet_01v8__model
-M$44 37 35 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
+M$44 47 35 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
 + AD=0.0588P PS=1.73U PD=0.7U
 * device instance $45 r0 *1 4.575,4.945 sky130_fd_pr__pfet_01v8__model
-M$45 1 40 38 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.0588P
+M$45 1 49 37 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.0588P
 + AD=0.1869P PS=0.7U PD=1.73U
 * device instance $46 r0 *1 6.325,4.945 sky130_fd_pr__pfet_01v8__model
-M$46 40 38 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
+M$46 49 37 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
 + AD=0.0588P PS=1.73U PD=0.7U
 * device instance $47 r0 *1 6.755,4.945 sky130_fd_pr__pfet_01v8__model
-M$47 1 50 41 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.0588P
+M$47 1 50 39 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.0588P
 + AD=0.1869P PS=0.7U PD=1.73U
 * device instance $48 r0 *1 8.505,4.945 sky130_fd_pr__pfet_01v8__model
-M$48 50 41 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
+M$48 50 39 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
 + AD=0.1113P PS=1.73U PD=1.37U
 .ENDS SP6TArray_2X4
diff --git a/testdata/lvs/test_22b.lvsdb b/testdata/lvs/test_22b.lvsdb
index fc40f292e..c3f876fc0 100644
--- a/testdata/lvs/test_22b.lvsdb
+++ b/testdata/lvs/test_22b.lvsdb
@@ -516,16 +516,16 @@ layout(
    rect(l2 (1365 2635) (420 280))
    polygon(l9 (-295 -305) (0 330) (170 0) (0 -80) (60 0) (0 -170) (-60 0) (0 -80))
    polygon(l9 (-170 0) (0 330) (170 0) (0 -80) (60 0) (0 -170) (-60 0) (0 -80))
-   rect(l11 (-140 -2610) (230 2920))
-   rect(l11 (-230 -2920) (230 5550))
+   rect(l11 (-140 -2610) (230 5550))
    rect(l11 (-230 -5550) (230 5550))
    rect(l11 (-230 -5550) (230 5550))
-   rect(l11 (-230 -2920) (230 2920))
+   rect(l11 (-230 -5550) (230 2920))
+   rect(l11 (-230 -290) (230 2920))
+   rect(l12 (-230 -5550) (230 5550))
    rect(l12 (-230 -5550) (230 5550))
    rect(l12 (-230 -5550) (230 5550))
    rect(l12 (-230 -5550) (230 2920))
-   rect(l12 (-230 -2920) (230 5550))
-   rect(l12 (-230 -2920) (230 2920))
+   rect(l12 (-230 -290) (230 2920))
    rect(l12 (-115 -2775) (0 0))
    rect(l21 (-145 -85) (170 170))
    rect(l21 (-170 -170) (170 170))
@@ -541,11 +541,11 @@ layout(
    rect(l11 (-230 -5550) (230 2920))
    rect(l11 (-230 -2920) (230 5550))
    rect(l11 (-230 -2920) (230 2920))
-   rect(l12 (-230 -5550) (230 5550))
-   rect(l12 (-230 -5550) (230 5550))
-   rect(l12 (-230 -5550) (230 5550))
    rect(l12 (-230 -5550) (230 2920))
-   rect(l12 (-230 -290) (230 2920))
+   rect(l12 (-230 -2920) (230 5550))
+   rect(l12 (-230 -5550) (230 5550))
+   rect(l12 (-230 -5550) (230 5550))
+   rect(l12 (-230 -2920) (230 2920))
    rect(l12 (-115 -2775) (0 0))
    rect(l21 (-25 -85) (170 170))
    rect(l21 (-170 -170) (170 170))
@@ -556,16 +556,16 @@ layout(
    rect(l2 (3545 2635) (420 280))
    polygon(l9 (-295 -305) (0 330) (170 0) (0 -80) (60 0) (0 -170) (-60 0) (0 -80))
    polygon(l9 (-170 0) (0 330) (170 0) (0 -80) (60 0) (0 -170) (-60 0) (0 -80))
-   rect(l11 (-140 -2610) (230 5550))
-   rect(l11 (-230 -5550) (230 5550))
-   rect(l11 (-230 -5550) (230 2920))
+   rect(l11 (-140 -2610) (230 2920))
    rect(l11 (-230 -2920) (230 5550))
+   rect(l11 (-230 -5550) (230 5550))
+   rect(l11 (-230 -5550) (230 5550))
    rect(l11 (-230 -2920) (230 2920))
    rect(l12 (-230 -5550) (230 5550))
-   rect(l12 (-230 -5550) (230 2920))
-   rect(l12 (-230 -2920) (230 5550))
    rect(l12 (-230 -5550) (230 5550))
-   rect(l12 (-230 -2920) (230 2920))
+   rect(l12 (-230 -5550) (230 5550))
+   rect(l12 (-230 -5550) (230 2920))
+   rect(l12 (-230 -290) (230 2920))
    rect(l12 (-115 -2775) (0 0))
    rect(l21 (-145 -85) (170 170))
    rect(l21 (-170 -170) (170 170))
@@ -576,15 +576,15 @@ layout(
    rect(l2 (4755 2635) (420 280))
    polygon(l9 (-295 -305) (0 80) (-60 0) (0 170) (60 0) (0 80) (170 0) (0 -330))
    polygon(l9 (-170 0) (0 80) (-60 0) (0 170) (60 0) (0 80) (170 0) (0 -330))
-   rect(l11 (-260 -2610) (230 5550))
-   rect(l11 (-230 -5550) (230 5550))
-   rect(l11 (-230 -5550) (230 2920))
+   rect(l11 (-260 -2610) (230 2920))
    rect(l11 (-230 -2920) (230 5550))
+   rect(l11 (-230 -5550) (230 5550))
+   rect(l11 (-230 -5550) (230 5550))
    rect(l11 (-230 -2920) (230 2920))
    rect(l12 (-230 -5550) (230 5550))
+   rect(l12 (-230 -5550) (230 5550))
    rect(l12 (-230 -5550) (230 2920))
    rect(l12 (-230 -2920) (230 5550))
-   rect(l12 (-230 -5550) (230 5550))
    rect(l12 (-230 -2920) (230 2920))
    rect(l12 (-115 -2775) (0 0))
    rect(l21 (-25 -85) (170 170))
@@ -596,15 +596,15 @@ layout(
    rect(l2 (5725 2635) (420 280))
    polygon(l9 (-295 -305) (0 330) (170 0) (0 -80) (60 0) (0 -170) (-60 0) (0 -80))
    polygon(l9 (-170 0) (0 330) (170 0) (0 -80) (60 0) (0 -170) (-60 0) (0 -80))
-   rect(l11 (-140 -2610) (230 5550))
-   rect(l11 (-230 -5550) (230 5550))
-   rect(l11 (-230 -5550) (230 2920))
+   rect(l11 (-140 -2610) (230 2920))
    rect(l11 (-230 -2920) (230 5550))
+   rect(l11 (-230 -5550) (230 5550))
+   rect(l11 (-230 -5550) (230 5550))
    rect(l11 (-230 -2920) (230 2920))
-   rect(l12 (-230 -5550) (230 5550))
    rect(l12 (-230 -5550) (230 2920))
    rect(l12 (-230 -2920) (230 5550))
    rect(l12 (-230 -5550) (230 5550))
+   rect(l12 (-230 -5550) (230 5550))
    rect(l12 (-230 -2920) (230 2920))
    rect(l12 (-115 -2775) (0 0))
    rect(l21 (-145 -85) (170 170))
@@ -636,15 +636,15 @@ layout(
    rect(l2 (7905 2635) (420 280))
    polygon(l9 (-295 -305) (0 330) (170 0) (0 -80) (60 0) (0 -170) (-60 0) (0 -80))
    polygon(l9 (-170 0) (0 330) (170 0) (0 -80) (60 0) (0 -170) (-60 0) (0 -80))
-   rect(l11 (-140 -2610) (230 2920))
+   rect(l11 (-140 -2610) (230 5550))
+   rect(l11 (-230 -5550) (230 2920))
    rect(l11 (-230 -2920) (230 5550))
    rect(l11 (-230 -5550) (230 5550))
-   rect(l11 (-230 -5550) (230 5550))
    rect(l11 (-230 -2920) (230 2920))
+   rect(l12 (-230 -5550) (230 5550))
    rect(l12 (-230 -5550) (230 2920))
    rect(l12 (-230 -2920) (230 5550))
    rect(l12 (-230 -5550) (230 5550))
-   rect(l12 (-230 -5550) (230 5550))
    rect(l12 (-230 -2920) (230 2920))
    rect(l12 (-115 -2775) (0 0))
    rect(l21 (-145 -85) (170 170))
@@ -690,23 +690,23 @@ layout(
    rect(l7 (950 -1320) (330 270))
   )
   net(15
-   rect(l2 (3625 395) (445 420))
-   polygon(l2 (-525 910) (0 760) (420 0) (0 -340) (105 0) (0 -420))
-   polygon(l9 (-405 -1280) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
+   polygon(l2 (3545 1725) (0 760) (420 0) (0 -340) (105 0) (0 -420))
+   rect(l2 (-445 -1330) (445 420))
+   polygon(l9 (-405 -370) (0 560) (-245 0) (0 170) (245 0) (0 840) (170 0) (0 -1570))
    rect(l21 (-335 560) (170 170))
-   rect(l21 (-5 -650) (170 170))
-   rect(l21 (-170 1070) (170 170))
-   rect(l22 (-1365 -980) (950 150))
+   rect(l21 (-5 590) (170 170))
+   rect(l21 (-170 -1410) (170 170))
+   rect(l22 (-1365 260) (950 150))
    rect(l22 (-1100 -840) (150 2010))
    rect(l22 (950 -1320) (330 270))
   )
   net(16
-   polygon(l2 (2470 1725) (0 420) (105 0) (0 340) (420 0) (0 -760))
-   rect(l2 (-525 -1330) (445 420))
-   polygon(l9 (-210 -370) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
-   rect(l21 (-170 1320) (170 170))
-   rect(l21 (-170 -1410) (170 170))
-   rect(l21 (-5 670) (170 170))
+   rect(l2 (2470 395) (445 420))
+   polygon(l2 (-445 910) (0 420) (105 0) (0 340) (420 0) (0 -760))
+   polygon(l9 (-290 -1280) (0 1570) (170 0) (0 -480) (245 0) (0 -170) (-245 0) (0 -920))
+   rect(l21 (-170 80) (170 170))
+   rect(l21 (-170 1070) (170 170))
+   rect(l21 (-5 -570) (170 170))
    rect(l22 (-250 -220) (330 270))
    rect(l22 (0 -150) (950 150))
    rect(l22 (0 -1320) (150 2010))
@@ -850,22 +850,22 @@ layout(
    polygon(l11 (1950 0) (0 290) (-15 0) (0 320) (260 0) (0 -320) (-15 0) (0 -290))
    polygon(l11 (1950 0) (0 290) (-15 0) (0 320) (260 0) (0 -320) (-15 0) (0 -290))
    polygon(l11 (1950 0) (0 290) (-15 0) (0 320) (260 0) (0 -320) (-15 0) (0 -290))
-   rect(l13 (-7745 320) (8720 260))
+   rect(l13 (-7745 320) (2180 260))
+   rect(l13 (-2180 -260) (2180 260))
+   rect(l13 (-2180 -260) (8720 260))
    rect(l13 (-8720 -260) (4360 260))
-   rect(l13 (-4360 -260) (2180 260))
+   rect(l13 (-2180 -260) (2180 260))
    rect(l13 (-2180 -260) (2180 260))
    rect(l13 (0 -260) (2180 260))
    rect(l13 (-2180 -260) (2180 260))
-   rect(l13 (0 -260) (4360 260))
-   rect(l13 (-4360 -260) (2180 260))
+   rect(l13 (-2180 -260) (4360 260))
    rect(l13 (-2180 -260) (2180 260))
-   rect(l13 (0 -260) (2180 260))
    rect(l13 (-2180 -260) (2180 260))
-   rect(l14 (-8720 -260) (8720 260))
-   rect(l14 (-8720 -260) (2180 260))
-   rect(l14 (-2180 -260) (4360 260))
+   rect(l14 (-8720 -260) (4360 260))
    rect(l14 (-4360 -260) (2180 260))
-   rect(l14 (0 -260) (2180 260))
+   rect(l14 (-2180 -260) (2180 260))
+   rect(l14 (-2180 -260) (8720 260))
+   rect(l14 (-6540 -260) (2180 260))
    rect(l14 (-2180 -260) (2180 260))
    rect(l14 (0 -130) (0 0))
    rect(l14 (0 -130) (2180 260))
@@ -934,17 +934,6 @@ layout(
    rect(l7 (950 -960) (150 2010))
   )
   net(37
-   polygon(l2 (3545 3065) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
-   rect(l2 (-340 1670) (445 420))
-   polygon(l9 (-405 -1620) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
-   rect(l21 (-170 80) (170 170))
-   rect(l21 (-335 590) (170 170))
-   rect(l21 (-5 310) (170 170))
-   rect(l22 (-1365 -580) (950 150))
-   rect(l22 (-1100 -1320) (150 2010))
-   rect(l22 (950 -960) (330 270))
-  )
-  net(38
    polygon(l2 (4755 3065) (0 340) (-105 0) (0 420) (525 0) (0 -760))
    rect(l2 (-525 1670) (445 420))
    polygon(l9 (-210 -1620) (0 1570) (170 0) (0 -920) (245 0) (0 -170) (-245 0) (0 -480))
@@ -955,23 +944,12 @@ layout(
    rect(l22 (0 -270) (950 150))
    rect(l22 (0 -840) (150 2010))
   )
-  net(39
+  net(38
    rect(l7 (5300 3965) (950 150))
    rect(l7 (-1280 -150) (330 270))
    rect(l7 (950 -960) (150 2010))
   )
-  net(40
-   polygon(l2 (5725 3065) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
-   rect(l2 (-340 1670) (445 420))
-   polygon(l9 (-405 -1620) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
-   rect(l21 (-170 80) (170 170))
-   rect(l21 (-335 590) (170 170))
-   rect(l21 (-5 310) (170 170))
-   rect(l22 (-1365 -580) (950 150))
-   rect(l22 (-1100 -1320) (150 2010))
-   rect(l22 (950 -960) (330 270))
-  )
-  net(41
+  net(39
    polygon(l2 (6935 3065) (0 340) (-105 0) (0 420) (525 0) (0 -760))
    rect(l2 (-525 1670) (445 420))
    polygon(l9 (-210 -1620) (0 1570) (170 0) (0 -920) (245 0) (0 -170) (-245 0) (0 -480))
@@ -982,38 +960,60 @@ layout(
    rect(l22 (0 -270) (950 150))
    rect(l22 (0 -840) (150 2010))
   )
-  net(42
+  net(40
    rect(l7 (7480 3965) (950 150))
    rect(l7 (-1280 -150) (330 270))
    rect(l7 (950 -960) (150 2010))
   )
-  net(43
+  net(41
    polygon(l7 (265 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
-  net(44
+  net(42
    polygon(l7 (6805 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
-  net(45
+  net(43
    polygon(l7 (2445 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
-  net(46
+  net(44
    polygon(l7 (4625 2915) (0 150) (690 0) (0 180) (270 0) (0 -180) (690 0) (0 -150))
   )
-  net(47
+  net(45
    rect(l7 (290 4445) (950 150))
    rect(l7 (-1100 -1320) (150 2010))
    rect(l7 (950 -960) (330 270))
   )
-  net(48
+  net(46
    rect(l7 (2470 4445) (950 150))
    rect(l7 (-1100 -1320) (150 2010))
    rect(l7 (950 -960) (330 270))
   )
-  net(49
+  net(47
+   polygon(l2 (3545 3065) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
+   rect(l2 (-340 1670) (445 420))
+   polygon(l9 (-405 -1620) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
+   rect(l21 (-335 840) (170 170))
+   rect(l21 (-5 -930) (170 170))
+   rect(l21 (-170 1070) (170 170))
+   rect(l22 (-1365 -580) (950 150))
+   rect(l22 (-1100 -1320) (150 2010))
+   rect(l22 (950 -960) (330 270))
+  )
+  net(48
    rect(l7 (4650 4445) (950 150))
    rect(l7 (-1100 -1320) (150 2010))
    rect(l7 (950 -960) (330 270))
   )
+  net(49
+   polygon(l2 (5725 3065) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
+   rect(l2 (-340 1670) (445 420))
+   polygon(l9 (-405 -1620) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
+   rect(l21 (-335 840) (170 170))
+   rect(l21 (-5 -930) (170 170))
+   rect(l21 (-170 1070) (170 170))
+   rect(l22 (-1365 -580) (950 150))
+   rect(l22 (-1100 -1320) (150 2010))
+   rect(l22 (950 -960) (330 270))
+  )
   net(50
    polygon(l2 (7905 3065) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
    rect(l2 (-340 1670) (445 420))
@@ -1333,7 +1333,7 @@ layout(
    param(PS 1.285)
    param(PD 0.7)
    terminal(S 35)
-   terminal(G 37)
+   terminal(G 47)
    terminal(D 52)
    terminal(B 52)
   )
@@ -1399,7 +1399,7 @@ layout(
    param(PD 1.285)
    terminal(S 5)
    terminal(G 31)
-   terminal(D 37)
+   terminal(D 47)
    terminal(B 52)
   )
   device(18 D$sky130_fd_pr__nfet_01v8__model$2
@@ -1412,7 +1412,7 @@ layout(
    param(PD 1.285)
    terminal(S 6)
    terminal(G 31)
-   terminal(D 38)
+   terminal(D 37)
    terminal(B 52)
   )
   device(19 D$sky130_fd_pr__nfet_01v8__model$8
@@ -1423,7 +1423,7 @@ layout(
    param(AD 0.0588)
    param(PS 1.285)
    param(PD 0.7)
-   terminal(S 37)
+   terminal(S 47)
    terminal(G 35)
    terminal(D 52)
    terminal(B 52)
@@ -1436,8 +1436,8 @@ layout(
    param(AD 0.0588)
    param(PS 1.285)
    param(PD 0.7)
-   terminal(S 38)
-   terminal(G 40)
+   terminal(S 37)
+   terminal(G 49)
    terminal(D 52)
    terminal(B 52)
   )
@@ -1503,7 +1503,7 @@ layout(
    param(PD 1.285)
    terminal(S 7)
    terminal(G 31)
-   terminal(D 40)
+   terminal(D 49)
    terminal(B 52)
   )
   device(26 D$sky130_fd_pr__nfet_01v8__model$2
@@ -1516,7 +1516,7 @@ layout(
    param(PD 1.285)
    terminal(S 8)
    terminal(G 31)
-   terminal(D 41)
+   terminal(D 39)
    terminal(B 52)
   )
   device(27 D$sky130_fd_pr__nfet_01v8__model$8
@@ -1527,8 +1527,8 @@ layout(
    param(AD 0.0588)
    param(PS 1.285)
    param(PD 0.7)
-   terminal(S 40)
-   terminal(G 38)
+   terminal(S 49)
+   terminal(G 37)
    terminal(D 52)
    terminal(B 52)
   )
@@ -1540,7 +1540,7 @@ layout(
    param(AD 0.0588)
    param(PS 1.285)
    param(PD 0.7)
-   terminal(S 41)
+   terminal(S 39)
    terminal(G 50)
    terminal(D 52)
    terminal(B 52)
@@ -1593,7 +1593,7 @@ layout(
    param(PS 1.285)
    param(PD 1.37)
    terminal(S 50)
-   terminal(G 41)
+   terminal(G 39)
    terminal(D 52)
    terminal(B 52)
   )
@@ -1736,7 +1736,7 @@ layout(
    param(PS 0.7)
    param(PD 1.73)
    terminal(S 1)
-   terminal(G 37)
+   terminal(G 47)
    terminal(D 35)
    terminal(B 1)
   )
@@ -1748,7 +1748,7 @@ layout(
    param(AD 0.0588)
    param(PS 1.73)
    param(PD 0.7)
-   terminal(S 37)
+   terminal(S 47)
    terminal(G 35)
    terminal(D 1)
    terminal(B 1)
@@ -1762,8 +1762,8 @@ layout(
    param(PS 0.7)
    param(PD 1.73)
    terminal(S 1)
-   terminal(G 40)
-   terminal(D 38)
+   terminal(G 49)
+   terminal(D 37)
    terminal(B 1)
   )
   device(46 D$sky130_fd_pr__pfet_01v8__model$1
@@ -1774,8 +1774,8 @@ layout(
    param(AD 0.0588)
    param(PS 1.73)
    param(PD 0.7)
-   terminal(S 40)
-   terminal(G 38)
+   terminal(S 49)
+   terminal(G 37)
    terminal(D 1)
    terminal(B 1)
   )
@@ -1789,7 +1789,7 @@ layout(
    param(PD 1.73)
    terminal(S 1)
    terminal(G 50)
-   terminal(D 41)
+   terminal(D 39)
    terminal(B 1)
   )
   device(48 D$sky130_fd_pr__pfet_01v8__model$3
@@ -1801,7 +1801,7 @@ layout(
    param(PS 1.73)
    param(PD 1.37)
    terminal(S 50)
-   terminal(G 41)
+   terminal(G 39)
    terminal(D 1)
    terminal(B 1)
   )
@@ -2504,14 +2504,14 @@ xref(
    net(16 18 match)
    net(15 17 match)
    net(35 20 match)
-   net(37 19 match)
+   net(47 19 match)
    net(20 22 match)
    net(19 21 match)
-   net(38 24 match)
-   net(40 23 match)
+   net(37 24 match)
+   net(49 23 match)
    net(24 26 match)
    net(23 25 match)
-   net(41 28 match)
+   net(39 28 match)
    net(50 27 match)
    net(2 5 match)
    net(4 7 match)
diff --git a/testdata/net_tracer/t1_all_nets.oas.gz b/testdata/net_tracer/t1_all_nets.oas.gz
index 728f52d8a..5a710240c 100644
Binary files a/testdata/net_tracer/t1_all_nets.oas.gz and b/testdata/net_tracer/t1_all_nets.oas.gz differ
diff --git a/testdata/net_tracer/t4_all_nets.oas.gz b/testdata/net_tracer/t4_all_nets.oas.gz
index 09ff7f710..a9a2efba3 100644
Binary files a/testdata/net_tracer/t4_all_nets.oas.gz and b/testdata/net_tracer/t4_all_nets.oas.gz differ
diff --git a/testdata/net_tracer/t4b_all_nets.oas.gz b/testdata/net_tracer/t4b_all_nets.oas.gz
index de67d58d9..8461fd262 100644
Binary files a/testdata/net_tracer/t4b_all_nets.oas.gz and b/testdata/net_tracer/t4b_all_nets.oas.gz differ
diff --git a/testdata/net_tracer/t5_all_nets.oas.gz b/testdata/net_tracer/t5_all_nets.oas.gz
index 8e4340750..41d400513 100644
Binary files a/testdata/net_tracer/t5_all_nets.oas.gz and b/testdata/net_tracer/t5_all_nets.oas.gz differ
diff --git a/testdata/net_tracer/t5b_all_nets.oas.gz b/testdata/net_tracer/t5b_all_nets.oas.gz
index dd7e2f56a..d7d70e9f6 100644
Binary files a/testdata/net_tracer/t5b_all_nets.oas.gz and b/testdata/net_tracer/t5b_all_nets.oas.gz differ
diff --git a/testdata/net_tracer/t5c_all_nets.oas.gz b/testdata/net_tracer/t5c_all_nets.oas.gz
index a6cf16398..5abaac758 100644
Binary files a/testdata/net_tracer/t5c_all_nets.oas.gz and b/testdata/net_tracer/t5c_all_nets.oas.gz differ
diff --git a/testdata/net_tracer/t5d_all_nets.oas.gz.1 b/testdata/net_tracer/t5d_all_nets.oas.gz.1
index 199d8d8ca..a0a91d691 100644
Binary files a/testdata/net_tracer/t5d_all_nets.oas.gz.1 and b/testdata/net_tracer/t5d_all_nets.oas.gz.1 differ
diff --git a/testdata/net_tracer/t5d_all_nets.oas.gz.2 b/testdata/net_tracer/t5d_all_nets.oas.gz.2
index 9861ae9eb..c858288fa 100644
Binary files a/testdata/net_tracer/t5d_all_nets.oas.gz.2 and b/testdata/net_tracer/t5d_all_nets.oas.gz.2 differ
diff --git a/testdata/net_tracer/t6_all_nets.oas.gz.1 b/testdata/net_tracer/t6_all_nets.oas.gz.1
index 709ef1e17..01198a04c 100644
Binary files a/testdata/net_tracer/t6_all_nets.oas.gz.1 and b/testdata/net_tracer/t6_all_nets.oas.gz.1 differ
diff --git a/testdata/net_tracer/t6_all_nets.oas.gz.2 b/testdata/net_tracer/t6_all_nets.oas.gz.2
index e83c1656f..2c5855ced 100644
Binary files a/testdata/net_tracer/t6_all_nets.oas.gz.2 and b/testdata/net_tracer/t6_all_nets.oas.gz.2 differ
diff --git a/testdata/net_tracer/t6_all_nets.oas.gz.3 b/testdata/net_tracer/t6_all_nets.oas.gz.3
index daf4f793c..e80730674 100644
Binary files a/testdata/net_tracer/t6_all_nets.oas.gz.3 and b/testdata/net_tracer/t6_all_nets.oas.gz.3 differ
diff --git a/testdata/net_tracer/t6_all_nets.oas.gz.4 b/testdata/net_tracer/t6_all_nets.oas.gz.4
index f5aba5bda..c23c41c53 100644
Binary files a/testdata/net_tracer/t6_all_nets.oas.gz.4 and b/testdata/net_tracer/t6_all_nets.oas.gz.4 differ
diff --git a/testdata/net_tracer/t6_all_nets.oas.gz.5 b/testdata/net_tracer/t6_all_nets.oas.gz.5
index 6e1635c13..3aeeab5cd 100644
Binary files a/testdata/net_tracer/t6_all_nets.oas.gz.5 and b/testdata/net_tracer/t6_all_nets.oas.gz.5 differ