Add additional taps throughout design
diff --git a/gds/user_analog_project_wrapper.gds b/gds/user_analog_project_wrapper.gds
index e34d13c..0182885 100644
--- a/gds/user_analog_project_wrapper.gds
+++ b/gds/user_analog_project_wrapper.gds
Binary files differ
diff --git a/mag/SSTL/SSTL.mag b/mag/SSTL/SSTL.mag
index 79f7d69..98c59d5 100644
--- a/mag/SSTL/SSTL.mag
+++ b/mag/SSTL/SSTL.mag
@@ -1,7 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1646785030
+timestamp 1646792692
+<< checkpaint >>
+rect -6264 -22040 10600 8224
+rect -6264 -22715 8142 -22040
+rect -6264 -23128 5540 -22715
 << nwell >>
 rect -48 3194 -30 3581
 rect -48 2106 -32 2383
@@ -24,6 +28,29 @@
 rect -48 -16390 -30 -16140
 rect -48 -17478 -32 -17201
 rect 504 -18887 520 -18566
+<< psubdiff >>
+rect -333 2595 -299 2629
+rect -241 2595 -207 2629
+rect -333 -669 -299 -635
+rect -241 -669 -207 -635
+rect -333 -3933 -299 -3899
+rect -241 -3933 -207 -3899
+rect -333 -7197 -299 -7163
+rect -241 -7197 -207 -7163
+rect -333 -10461 -299 -10427
+rect -241 -10461 -207 -10427
+rect -333 -13725 -299 -13691
+rect -241 -13725 -207 -13691
+rect -333 -16989 -299 -16955
+rect -241 -16989 -207 -16955
+<< psubdiffcont >>
+rect -299 2595 -241 2629
+rect -299 -669 -241 -635
+rect -299 -3933 -241 -3899
+rect -299 -7197 -241 -7163
+rect -299 -10461 -241 -10427
+rect -299 -13725 -241 -13691
+rect -299 -16989 -241 -16955
 << locali >>
 rect -1909 3485 -1846 3547
 rect 6262 963 6291 997
@@ -234,7 +261,7 @@
 rect -251 1810 150 1822
 rect -448 1731 -442 1793
 rect -380 1731 -374 1793
-rect 66 1781 150 1810
+rect 66 1733 150 1810
 rect -432 1722 -389 1731
 rect 1633 1390 1685 1396
 rect 1743 1310 1753 1362
@@ -296,8 +323,13 @@
 rect -251 -1454 150 -1442
 rect -448 -1533 -442 -1471
 rect -380 -1533 -374 -1471
-rect 66 -1483 150 -1454
+rect 66 -1499 150 -1454
+rect 66 -1505 256 -1499
+rect 66 -1531 150 -1505
 rect -432 -1542 -389 -1533
+rect 66 -1557 78 -1531
+rect 244 -1557 256 -1505
+rect 66 -1563 256 -1557
 rect 1623 -1874 1633 -1822
 rect 1685 -1874 1695 -1822
 rect 1743 -1954 1753 -1902
@@ -359,8 +391,13 @@
 rect -251 -4718 150 -4706
 rect -448 -4797 -442 -4735
 rect -380 -4797 -374 -4735
-rect 66 -4747 150 -4718
+rect 66 -4763 150 -4718
+rect 66 -4769 256 -4763
+rect 66 -4795 150 -4769
 rect -432 -4806 -389 -4797
+rect 66 -4821 78 -4795
+rect 244 -4821 256 -4769
+rect 66 -4827 256 -4821
 rect 1623 -5132 1633 -5080
 rect 1685 -5132 1695 -5080
 rect 1743 -5218 1753 -5166
@@ -422,8 +459,13 @@
 rect -251 -7982 150 -7970
 rect -448 -8061 -442 -7999
 rect -380 -8061 -374 -7999
-rect 66 -8011 150 -7982
+rect 66 -8027 150 -7982
+rect 66 -8033 256 -8027
+rect 66 -8059 150 -8033
 rect -432 -8070 -389 -8061
+rect 66 -8085 78 -8059
+rect 244 -8085 256 -8033
+rect 66 -8091 256 -8085
 rect 1623 -8396 1633 -8344
 rect 1685 -8396 1695 -8344
 rect 1743 -8482 1753 -8430
@@ -485,8 +527,13 @@
 rect -251 -11246 150 -11234
 rect -448 -11325 -442 -11263
 rect -380 -11325 -374 -11263
-rect 66 -11275 150 -11246
+rect 66 -11291 150 -11246
+rect 66 -11297 256 -11291
+rect 66 -11323 150 -11297
 rect -432 -11334 -389 -11325
+rect 66 -11349 78 -11323
+rect 244 -11349 256 -11297
+rect 66 -11355 256 -11349
 rect 1623 -11660 1633 -11608
 rect 1685 -11660 1695 -11608
 rect 1743 -11746 1753 -11694
@@ -548,8 +595,13 @@
 rect -251 -14510 150 -14498
 rect -448 -14589 -442 -14527
 rect -380 -14589 -374 -14527
-rect 66 -14539 150 -14510
+rect 66 -14555 150 -14510
+rect 66 -14561 256 -14555
+rect 66 -14587 150 -14561
 rect -432 -14598 -389 -14589
+rect 66 -14613 78 -14587
+rect 244 -14613 256 -14561
+rect 66 -14619 256 -14613
 rect 1623 -14924 1633 -14872
 rect 1685 -14924 1695 -14872
 rect 1743 -15010 1753 -14958
@@ -611,8 +663,13 @@
 rect -251 -17774 150 -17762
 rect -448 -17853 -442 -17791
 rect -380 -17853 -374 -17791
-rect 66 -17803 150 -17774
+rect 66 -17819 150 -17774
+rect 66 -17825 256 -17819
+rect 66 -17851 150 -17825
 rect -432 -17862 -389 -17853
+rect 66 -17877 78 -17851
+rect 244 -17877 256 -17825
+rect 66 -17883 256 -17877
 rect 1623 -18188 1633 -18136
 rect 1685 -18188 1695 -18136
 rect 1743 -18274 1753 -18222
@@ -1936,318 +1993,126 @@
 rect 2151 -18621 2185 -18043
 rect 6417 -18621 6446 -18043
 rect 2151 -19196 6446 -18621
-use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_7 ~/cad/share/pdk/sky130A/libs.ref/sky130_fd_sc_hd/mag
-timestamp 1643856600
-transform 1 0 -914 0 1 -19148
-box -38 -48 130 592
-use sky130_fd_sc_hd__clkbuf_8  sky130_fd_sc_hd__clkbuf_8_6 ~/cad/share/pdk/sky130A/libs.ref/sky130_fd_sc_hd/mag
-timestamp 1643856600
-transform 1 0 558 0 1 -19148
-box -38 -48 1050 592
-use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_21 ~/cad/share/pdk/sky130A/libs.ref/sky130_fd_sc_hd/mag
-timestamp 1643856600
-transform 1 0 -86 0 1 -18060
-box -38 -48 130 592
-use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_7
-timestamp 1643856600
-transform 1 0 -2294 0 1 -19148
-box -38 -48 130 592
-use sky130_fd_sc_hd__clkinv_4  sky130_fd_sc_hd__clkinv_4_12 ~/cad/share/pdk/sky130A/libs.ref/sky130_fd_sc_hd/mag
-timestamp 1643856600
-transform 1 0 -86 0 1 -19148
-box -38 -48 682 592
-use sky130_fd_sc_hd__clkinv_4  sky130_fd_sc_hd__clkinv_4_13
-timestamp 1643856600
-transform 1 0 -730 0 1 -19148
-box -38 -48 682 592
-use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_18 ~/cad/share/pdk/sky130A/libs.ref/sky130_fd_sc_hd/mag
-timestamp 1643856600
-transform 1 0 -2294 0 1 -18060
-box -38 -48 2246 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_26 ~/cad/share/pdk/sky130A/libs.ref/sky130_fd_sc_hd/mag
-timestamp 1643856600
-transform 1 0 -1466 0 1 -19148
-box -38 -48 774 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_27
-timestamp 1643856600
-transform 1 0 -2202 0 1 -19148
-box -38 -48 774 592
-use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_20
-timestamp 1643856600
-transform 1 0 -86 0 1 -16972
-box -38 -48 130 592
-use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_19
-timestamp 1643856600
-transform 1 0 -2294 0 -1 -16972
-box -38 -48 2246 592
-use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_20
-timestamp 1643856600
-transform 1 0 -2294 0 1 -16972
-box -38 -48 2246 592
-use n-leg  n-leg_6
-timestamp 1646531211
-transform 1 0 -284 0 1 -19148
+use n-leg  n-leg_0
+timestamp 1646792692
+transform 1 0 -284 0 1 436
 box 1854 -48 6546 1136
-use p-leg  p-leg_6
-timestamp 1646525656
-transform 1 0 2 0 1 -18070
-box -34 -38 6666 2234
-use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_6
-timestamp 1643856600
-transform 1 0 -914 0 1 -15884
-box -38 -48 130 592
-use sky130_fd_sc_hd__clkbuf_8  sky130_fd_sc_hd__clkbuf_8_5
-timestamp 1643856600
-transform 1 0 558 0 1 -15884
-box -38 -48 1050 592
-use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_6
-timestamp 1643856600
-transform 1 0 -2294 0 1 -15884
-box -38 -48 130 592
-use sky130_fd_sc_hd__clkinv_4  sky130_fd_sc_hd__clkinv_4_10
-timestamp 1643856600
-transform 1 0 -86 0 1 -15884
-box -38 -48 682 592
-use sky130_fd_sc_hd__clkinv_4  sky130_fd_sc_hd__clkinv_4_11
-timestamp 1643856600
-transform 1 0 -730 0 1 -15884
-box -38 -48 682 592
-use sky130_fd_sc_hd__clkbuf_16  sky130_fd_sc_hd__clkbuf_16_6 ~/cad/share/pdk/sky130A/libs.ref/sky130_fd_sc_hd/mag
-timestamp 1643856600
-transform 1 0 -1926 0 -1 -15884
-box -38 -48 1878 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_24
-timestamp 1643856600
-transform 1 0 -1466 0 1 -15884
-box -38 -48 774 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_25
-timestamp 1643856600
-transform 1 0 -2202 0 1 -15884
-box -38 -48 774 592
-use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_19
-timestamp 1643856600
-transform 1 0 -86 0 1 -14796
-box -38 -48 130 592
-use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_15
-timestamp 1643856600
-transform 1 0 -2294 0 1 -14796
-box -38 -48 2246 592
-use n-leg  n-leg_5
-timestamp 1646531211
-transform 1 0 -284 0 1 -15884
+use n-leg  n-leg_1
+timestamp 1646792692
+transform 1 0 -284 0 1 -2828
 box 1854 -48 6546 1136
-use p-leg  p-leg_5
-timestamp 1646525656
-transform 1 0 2 0 1 -14806
-box -34 -38 6666 2234
-use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_18
-timestamp 1643856600
-transform 1 0 -86 0 1 -13708
-box -38 -48 130 592
-use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_17
-timestamp 1643856600
-transform 1 0 -2294 0 1 -13708
-box -38 -48 2246 592
-use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_16
-timestamp 1643856600
-transform 1 0 -2294 0 -1 -13708
-box -38 -48 2246 592
-use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_5
-timestamp 1643856600
-transform 1 0 -914 0 1 -12620
-box -38 -48 130 592
-use sky130_fd_sc_hd__clkbuf_8  sky130_fd_sc_hd__clkbuf_8_4
-timestamp 1643856600
-transform 1 0 558 0 1 -12620
-box -38 -48 1050 592
-use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_5
-timestamp 1643856600
-transform 1 0 -2294 0 1 -12620
-box -38 -48 130 592
-use sky130_fd_sc_hd__clkinv_4  sky130_fd_sc_hd__clkinv_4_8
-timestamp 1643856600
-transform 1 0 -86 0 1 -12620
-box -38 -48 682 592
-use sky130_fd_sc_hd__clkinv_4  sky130_fd_sc_hd__clkinv_4_9
-timestamp 1643856600
-transform 1 0 -730 0 1 -12620
-box -38 -48 682 592
-use sky130_fd_sc_hd__clkbuf_16  sky130_fd_sc_hd__clkbuf_16_5
-timestamp 1643856600
-transform 1 0 -1926 0 -1 -12620
-box -38 -48 1878 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_22
-timestamp 1643856600
-transform 1 0 -1466 0 1 -12620
-box -38 -48 774 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_23
-timestamp 1643856600
-transform 1 0 -2202 0 1 -12620
-box -38 -48 774 592
-use n-leg  n-leg_4
-timestamp 1646531211
-transform 1 0 -284 0 1 -12620
-box 1854 -48 6546 1136
-use p-leg  p-leg_4
-timestamp 1646525656
-transform 1 0 2 0 1 -11542
-box -34 -38 6666 2234
-use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_17
-timestamp 1643856600
-transform 1 0 -86 0 1 -11532
-box -38 -48 130 592
-use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_16
-timestamp 1643856600
-transform 1 0 -86 0 1 -10444
-box -38 -48 130 592
-use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_12
-timestamp 1643856600
-transform 1 0 -2294 0 1 -11532
-box -38 -48 2246 592
-use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_13
-timestamp 1643856600
-transform 1 0 -2294 0 -1 -10444
-box -38 -48 2246 592
-use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_14
-timestamp 1643856600
-transform 1 0 -2294 0 1 -10444
-box -38 -48 2246 592
-use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_4
-timestamp 1643856600
-transform 1 0 -914 0 1 -9356
-box -38 -48 130 592
-use sky130_fd_sc_hd__clkbuf_8  sky130_fd_sc_hd__clkbuf_8_3
-timestamp 1643856600
-transform 1 0 558 0 1 -9356
-box -38 -48 1050 592
-use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_4
-timestamp 1643856600
-transform 1 0 -2294 0 1 -9356
-box -38 -48 130 592
-use sky130_fd_sc_hd__clkinv_4  sky130_fd_sc_hd__clkinv_4_6
-timestamp 1643856600
-transform 1 0 -86 0 1 -9356
-box -38 -48 682 592
-use sky130_fd_sc_hd__clkinv_4  sky130_fd_sc_hd__clkinv_4_7
-timestamp 1643856600
-transform 1 0 -730 0 1 -9356
-box -38 -48 682 592
-use sky130_fd_sc_hd__clkbuf_16  sky130_fd_sc_hd__clkbuf_16_4
-timestamp 1643856600
-transform 1 0 -1926 0 -1 -9356
-box -38 -48 1878 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_20
-timestamp 1643856600
-transform 1 0 -1466 0 1 -9356
-box -38 -48 774 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_21
-timestamp 1643856600
-transform 1 0 -2202 0 1 -9356
-box -38 -48 774 592
-use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_15
-timestamp 1643856600
-transform 1 0 -86 0 1 -8268
-box -38 -48 130 592
-use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_9
-timestamp 1643856600
-transform 1 0 -2294 0 1 -8268
-box -38 -48 2246 592
-use n-leg  n-leg_3
-timestamp 1646531211
-transform 1 0 -284 0 1 -9356
-box 1854 -48 6546 1136
-use p-leg  p-leg_3
-timestamp 1646525656
-transform 1 0 2 0 1 -8278
-box -34 -38 6666 2234
-use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_14
-timestamp 1643856600
-transform 1 0 -86 0 1 -7180
-box -38 -48 130 592
-use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_11
-timestamp 1643856600
-transform 1 0 -2294 0 1 -7180
-box -38 -48 2246 592
-use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_10
-timestamp 1643856600
-transform 1 0 -2294 0 -1 -7180
-box -38 -48 2246 592
-use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_3
-timestamp 1643856600
-transform 1 0 -914 0 1 -6092
-box -38 -48 130 592
-use sky130_fd_sc_hd__clkbuf_8  sky130_fd_sc_hd__clkbuf_8_2
-timestamp 1643856600
-transform 1 0 558 0 1 -6092
-box -38 -48 1050 592
-use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_3
-timestamp 1643856600
-transform 1 0 -2294 0 1 -6092
-box -38 -48 130 592
-use sky130_fd_sc_hd__clkinv_4  sky130_fd_sc_hd__clkinv_4_4
-timestamp 1643856600
-transform 1 0 -86 0 1 -6092
-box -38 -48 682 592
-use sky130_fd_sc_hd__clkinv_4  sky130_fd_sc_hd__clkinv_4_5
-timestamp 1643856600
-transform 1 0 -730 0 1 -6092
-box -38 -48 682 592
-use sky130_fd_sc_hd__clkbuf_16  sky130_fd_sc_hd__clkbuf_16_3
-timestamp 1643856600
-transform 1 0 -1926 0 -1 -6092
-box -38 -48 1878 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_18
-timestamp 1643856600
-transform 1 0 -1466 0 1 -6092
-box -38 -48 774 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_19
-timestamp 1643856600
-transform 1 0 -2202 0 1 -6092
-box -38 -48 774 592
 use n-leg  n-leg_2
-timestamp 1646531211
+timestamp 1646792692
 transform 1 0 -284 0 1 -6092
 box 1854 -48 6546 1136
+use n-leg  n-leg_3
+timestamp 1646792692
+transform 1 0 -284 0 1 -9356
+box 1854 -48 6546 1136
+use n-leg  n-leg_4
+timestamp 1646792692
+transform 1 0 -284 0 1 -12620
+box 1854 -48 6546 1136
+use n-leg  n-leg_5
+timestamp 1646792692
+transform 1 0 -284 0 1 -15884
+box 1854 -48 6546 1136
+use n-leg  n-leg_6
+timestamp 1646792692
+transform 1 0 -284 0 1 -19148
+box 1854 -48 6546 1136
+use p-leg  p-leg_0
+timestamp 1646792189
+transform 1 0 2 0 1 1514
+box -34 -38 6666 2234
+use p-leg  p-leg_1
+timestamp 1646792189
+transform 1 0 2 0 1 -1750
+box -34 -38 6666 2234
 use p-leg  p-leg_2
-timestamp 1646525656
+timestamp 1646792189
 transform 1 0 2 0 1 -5014
 box -34 -38 6666 2234
-use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_13
+use p-leg  p-leg_3
+timestamp 1646792189
+transform 1 0 2 0 1 -8278
+box -34 -38 6666 2234
+use p-leg  p-leg_4
+timestamp 1646792189
+transform 1 0 2 0 1 -11542
+box -34 -38 6666 2234
+use p-leg  p-leg_5
+timestamp 1646792189
+transform 1 0 2 0 1 -14806
+box -34 -38 6666 2234
+use p-leg  p-leg_6
+timestamp 1646792189
+transform 1 0 2 0 1 -18070
+box -34 -38 6666 2234
+use sky130_fd_sc_hd__clkbuf_8  sky130_fd_sc_hd__clkbuf_8_0 
 timestamp 1643856600
-transform 1 0 -86 0 1 -5004
-box -38 -48 130 592
-use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_12
-timestamp 1643856600
-transform 1 0 -86 0 1 -3916
-box -38 -48 130 592
-use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_6
-timestamp 1643856600
-transform 1 0 -2294 0 1 -5004
-box -38 -48 2246 592
-use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_8
-timestamp 1643856600
-transform 1 0 -2294 0 1 -3916
-box -38 -48 2246 592
-use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_7
-timestamp 1643856600
-transform 1 0 -2294 0 -1 -3916
-box -38 -48 2246 592
-use sky130_fd_sc_hd__clkbuf_16  sky130_fd_sc_hd__clkbuf_16_2
-timestamp 1643856600
-transform 1 0 -1926 0 -1 -2828
-box -38 -48 1878 592
-use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_2
-timestamp 1643856600
-transform 1 0 -914 0 1 -2828
-box -38 -48 130 592
+transform 1 0 558 0 1 436
+box -38 -48 1050 592
 use sky130_fd_sc_hd__clkbuf_8  sky130_fd_sc_hd__clkbuf_8_1
 timestamp 1643856600
 transform 1 0 558 0 1 -2828
 box -38 -48 1050 592
-use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_2
+use sky130_fd_sc_hd__clkbuf_8  sky130_fd_sc_hd__clkbuf_8_2
 timestamp 1643856600
-transform 1 0 -2294 0 1 -2828
-box -38 -48 130 592
+transform 1 0 558 0 1 -6092
+box -38 -48 1050 592
+use sky130_fd_sc_hd__clkbuf_8  sky130_fd_sc_hd__clkbuf_8_3
+timestamp 1643856600
+transform 1 0 558 0 1 -9356
+box -38 -48 1050 592
+use sky130_fd_sc_hd__clkbuf_8  sky130_fd_sc_hd__clkbuf_8_4
+timestamp 1643856600
+transform 1 0 558 0 1 -12620
+box -38 -48 1050 592
+use sky130_fd_sc_hd__clkbuf_8  sky130_fd_sc_hd__clkbuf_8_5
+timestamp 1643856600
+transform 1 0 558 0 1 -15884
+box -38 -48 1050 592
+use sky130_fd_sc_hd__clkbuf_8  sky130_fd_sc_hd__clkbuf_8_6
+timestamp 1643856600
+transform 1 0 558 0 1 -19148
+box -38 -48 1050 592
+use sky130_fd_sc_hd__clkbuf_16  sky130_fd_sc_hd__clkbuf_16_0 
+timestamp 1643856600
+transform 1 0 -1926 0 -1 3700
+box -38 -48 1878 592
+use sky130_fd_sc_hd__clkbuf_16  sky130_fd_sc_hd__clkbuf_16_1
+timestamp 1643856600
+transform 1 0 -1926 0 -1 436
+box -38 -48 1878 592
+use sky130_fd_sc_hd__clkbuf_16  sky130_fd_sc_hd__clkbuf_16_2
+timestamp 1643856600
+transform 1 0 -1926 0 -1 -2828
+box -38 -48 1878 592
+use sky130_fd_sc_hd__clkbuf_16  sky130_fd_sc_hd__clkbuf_16_3
+timestamp 1643856600
+transform 1 0 -1926 0 -1 -6092
+box -38 -48 1878 592
+use sky130_fd_sc_hd__clkbuf_16  sky130_fd_sc_hd__clkbuf_16_4
+timestamp 1643856600
+transform 1 0 -1926 0 -1 -9356
+box -38 -48 1878 592
+use sky130_fd_sc_hd__clkbuf_16  sky130_fd_sc_hd__clkbuf_16_5
+timestamp 1643856600
+transform 1 0 -1926 0 -1 -12620
+box -38 -48 1878 592
+use sky130_fd_sc_hd__clkbuf_16  sky130_fd_sc_hd__clkbuf_16_6
+timestamp 1643856600
+transform 1 0 -1926 0 -1 -15884
+box -38 -48 1878 592
+use sky130_fd_sc_hd__clkinv_4  sky130_fd_sc_hd__clkinv_4_0 
+timestamp 1643856600
+transform 1 0 -86 0 1 436
+box -38 -48 682 592
+use sky130_fd_sc_hd__clkinv_4  sky130_fd_sc_hd__clkinv_4_1
+timestamp 1643856600
+transform 1 0 -730 0 1 436
+box -38 -48 682 592
 use sky130_fd_sc_hd__clkinv_4  sky130_fd_sc_hd__clkinv_4_2
 timestamp 1643856600
 transform 1 0 -86 0 1 -2828
@@ -2256,139 +2121,219 @@
 timestamp 1643856600
 transform 1 0 -730 0 1 -2828
 box -38 -48 682 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_16
+use sky130_fd_sc_hd__clkinv_4  sky130_fd_sc_hd__clkinv_4_4
 timestamp 1643856600
-transform 1 0 -1466 0 1 -2828
-box -38 -48 774 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_17
+transform 1 0 -86 0 1 -6092
+box -38 -48 682 592
+use sky130_fd_sc_hd__clkinv_4  sky130_fd_sc_hd__clkinv_4_5
 timestamp 1643856600
-transform 1 0 -2202 0 1 -2828
-box -38 -48 774 592
-use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_10
+transform 1 0 -730 0 1 -6092
+box -38 -48 682 592
+use sky130_fd_sc_hd__clkinv_4  sky130_fd_sc_hd__clkinv_4_6
 timestamp 1643856600
-transform 1 0 -86 0 1 -1740
-box -38 -48 130 592
+transform 1 0 -86 0 1 -9356
+box -38 -48 682 592
+use sky130_fd_sc_hd__clkinv_4  sky130_fd_sc_hd__clkinv_4_7
+timestamp 1643856600
+transform 1 0 -730 0 1 -9356
+box -38 -48 682 592
+use sky130_fd_sc_hd__clkinv_4  sky130_fd_sc_hd__clkinv_4_8
+timestamp 1643856600
+transform 1 0 -86 0 1 -12620
+box -38 -48 682 592
+use sky130_fd_sc_hd__clkinv_4  sky130_fd_sc_hd__clkinv_4_9
+timestamp 1643856600
+transform 1 0 -730 0 1 -12620
+box -38 -48 682 592
+use sky130_fd_sc_hd__clkinv_4  sky130_fd_sc_hd__clkinv_4_10
+timestamp 1643856600
+transform 1 0 -86 0 1 -15884
+box -38 -48 682 592
+use sky130_fd_sc_hd__clkinv_4  sky130_fd_sc_hd__clkinv_4_11
+timestamp 1643856600
+transform 1 0 -730 0 1 -15884
+box -38 -48 682 592
+use sky130_fd_sc_hd__clkinv_4  sky130_fd_sc_hd__clkinv_4_12
+timestamp 1643856600
+transform 1 0 -86 0 1 -19148
+box -38 -48 682 592
+use sky130_fd_sc_hd__clkinv_4  sky130_fd_sc_hd__clkinv_4_13
+timestamp 1643856600
+transform 1 0 -730 0 1 -19148
+box -38 -48 682 592
+use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_0 
+timestamp 1646792692
+transform 1 0 -2294 0 1 1524
+box -38 -48 2246 592
+use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_1
+timestamp 1646792692
+transform 1 0 -2294 0 -1 2612
+box -38 -48 2246 592
+use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_2
+timestamp 1646792692
+transform 1 0 -2294 0 1 2612
+box -38 -48 2246 592
 use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_3
-timestamp 1643856600
+timestamp 1646792692
 transform 1 0 -2294 0 1 -1740
 box -38 -48 2246 592
 use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_4
-timestamp 1643856600
+timestamp 1646792692
 transform 1 0 -2294 0 -1 -652
 box -38 -48 2246 592
-use n-leg  n-leg_1
-timestamp 1646531211
-transform 1 0 -284 0 1 -2828
-box 1854 -48 6546 1136
-use p-leg  p-leg_1
-timestamp 1646525656
-transform 1 0 2 0 1 -1750
-box -34 -38 6666 2234
-use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_11
-timestamp 1643856600
-transform 1 0 -86 0 1 -652
-box -38 -48 130 592
 use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_5
-timestamp 1643856600
+timestamp 1646792692
 transform 1 0 -2294 0 1 -652
 box -38 -48 2246 592
-use sky130_fd_sc_hd__clkbuf_16  sky130_fd_sc_hd__clkbuf_16_1
+use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_6
+timestamp 1646792692
+transform 1 0 -2294 0 1 -5004
+box -38 -48 2246 592
+use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_7
+timestamp 1646792692
+transform 1 0 -2294 0 -1 -3916
+box -38 -48 2246 592
+use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_8
+timestamp 1646792692
+transform 1 0 -2294 0 1 -3916
+box -38 -48 2246 592
+use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_9
+timestamp 1646792692
+transform 1 0 -2294 0 1 -8268
+box -38 -48 2246 592
+use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_10
+timestamp 1646792692
+transform 1 0 -2294 0 -1 -7180
+box -38 -48 2246 592
+use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_11
+timestamp 1646792692
+transform 1 0 -2294 0 1 -7180
+box -38 -48 2246 592
+use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_12
+timestamp 1646792692
+transform 1 0 -2294 0 1 -11532
+box -38 -48 2246 592
+use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_13
+timestamp 1646792692
+transform 1 0 -2294 0 -1 -10444
+box -38 -48 2246 592
+use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_14
+timestamp 1646792692
+transform 1 0 -2294 0 1 -10444
+box -38 -48 2246 592
+use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_15
+timestamp 1646792692
+transform 1 0 -2294 0 1 -14796
+box -38 -48 2246 592
+use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_16
+timestamp 1646792692
+transform 1 0 -2294 0 -1 -13708
+box -38 -48 2246 592
+use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_17
+timestamp 1646792692
+transform 1 0 -2294 0 1 -13708
+box -38 -48 2246 592
+use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_18
+timestamp 1646792692
+transform 1 0 -2294 0 1 -18060
+box -38 -48 2246 592
+use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_19
+timestamp 1646792692
+transform 1 0 -2294 0 -1 -16972
+box -38 -48 2246 592
+use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_20
+timestamp 1646792692
+transform 1 0 -2294 0 1 -16972
+box -38 -48 2246 592
+use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_0 
 timestamp 1643856600
-transform 1 0 -1926 0 -1 436
-box -38 -48 1878 592
-use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_1
-timestamp 1643856600
-transform 1 0 -914 0 1 436
+transform 1 0 -2294 0 1 3700
 box -38 -48 130 592
-use sky130_fd_sc_hd__clkbuf_8  sky130_fd_sc_hd__clkbuf_8_0
-timestamp 1643856600
-transform 1 0 558 0 1 436
-box -38 -48 1050 592
 use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_1
 timestamp 1643856600
 transform 1 0 -2294 0 1 436
 box -38 -48 130 592
-use sky130_fd_sc_hd__clkinv_4  sky130_fd_sc_hd__clkinv_4_1
+use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_2
 timestamp 1643856600
-transform 1 0 -730 0 1 436
-box -38 -48 682 592
-use sky130_fd_sc_hd__clkinv_4  sky130_fd_sc_hd__clkinv_4_0
+transform 1 0 -2294 0 1 -2828
+box -38 -48 130 592
+use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_3
 timestamp 1643856600
-transform 1 0 -86 0 1 436
-box -38 -48 682 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_14
+transform 1 0 -2294 0 1 -6092
+box -38 -48 130 592
+use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_4
 timestamp 1643856600
-transform 1 0 -1466 0 1 436
-box -38 -48 774 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_15
+transform 1 0 -2294 0 1 -9356
+box -38 -48 130 592
+use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_5
 timestamp 1643856600
-transform 1 0 -2202 0 1 436
-box -38 -48 774 592
-use n-leg  n-leg_0
-timestamp 1646531211
-transform 1 0 -284 0 1 436
-box 1854 -48 6546 1136
-use p-leg  p-leg_0
-timestamp 1646525656
-transform 1 0 2 0 1 1514
-box -34 -38 6666 2234
-use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_9
+transform 1 0 -2294 0 1 -12620
+box -38 -48 130 592
+use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_6
 timestamp 1643856600
-transform 1 0 -86 0 1 1524
+transform 1 0 -2294 0 1 -15884
+box -38 -48 130 592
+use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_7
+timestamp 1643856600
+transform 1 0 -2294 0 1 -19148
 box -38 -48 130 592
 use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_8
 timestamp 1643856600
 transform 1 0 -86 0 1 2612
 box -38 -48 130 592
-use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_0
+use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_9
 timestamp 1643856600
-transform 1 0 -2294 0 1 1524
-box -38 -48 2246 592
-use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_1
-timestamp 1643856600
-transform 1 0 -2294 0 -1 2612
-box -38 -48 2246 592
-use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_2
-timestamp 1643856600
-transform 1 0 -2294 0 1 2612
-box -38 -48 2246 592
-use sky130_fd_sc_hd__clkbuf_16  sky130_fd_sc_hd__clkbuf_16_0
-timestamp 1643856600
-transform 1 0 -1926 0 -1 3700
-box -38 -48 1878 592
-use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_0
-timestamp 1643856600
-transform 1 0 -2294 0 1 3700
+transform 1 0 -86 0 1 1524
 box -38 -48 130 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_13
+use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_10
 timestamp 1643856600
-transform 1 0 -2202 0 1 3700
-box -38 -48 774 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_12
-timestamp 1643856600
-transform 1 0 -1466 0 1 3700
-box -38 -48 774 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_11
-timestamp 1643856600
-transform 1 0 -730 0 1 3700
-box -38 -48 774 592
-use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_0
-timestamp 1643856600
-transform 1 0 6 0 1 3700
+transform 1 0 -86 0 1 -1740
 box -38 -48 130 592
-use sky130_fd_sc_hd__inv_1  sky130_fd_sc_hd__inv_1_2 ~/cad/share/pdk/sky130A/libs.ref/sky130_fd_sc_hd/mag
+use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_11
 timestamp 1643856600
-transform 1 0 742 0 1 3700
-box -38 -48 314 592
-use sky130_fd_sc_hd__inv_1  sky130_fd_sc_hd__inv_1_1
+transform 1 0 -86 0 1 -652
+box -38 -48 130 592
+use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_12
 timestamp 1643856600
-transform 1 0 466 0 1 3700
-box -38 -48 314 592
-use sky130_fd_sc_hd__inv_1  sky130_fd_sc_hd__inv_1_0
+transform 1 0 -86 0 1 -3916
+box -38 -48 130 592
+use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_13
 timestamp 1643856600
-transform 1 0 190 0 1 3700
-box -38 -48 314 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_0
+transform 1 0 -86 0 1 -5004
+box -38 -48 130 592
+use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_14
+timestamp 1643856600
+transform 1 0 -86 0 1 -7180
+box -38 -48 130 592
+use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_15
+timestamp 1643856600
+transform 1 0 -86 0 1 -8268
+box -38 -48 130 592
+use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_16
+timestamp 1643856600
+transform 1 0 -86 0 1 -10444
+box -38 -48 130 592
+use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_17
+timestamp 1643856600
+transform 1 0 -86 0 1 -11532
+box -38 -48 130 592
+use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_18
+timestamp 1643856600
+transform 1 0 -86 0 1 -13708
+box -38 -48 130 592
+use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_19
+timestamp 1643856600
+transform 1 0 -86 0 1 -14796
+box -38 -48 130 592
+use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_20
+timestamp 1643856600
+transform 1 0 -86 0 1 -16972
+box -38 -48 130 592
+use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_21
+timestamp 1643856600
+transform 1 0 -86 0 1 -18060
+box -38 -48 130 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_0 
 timestamp 1643856600
 transform 1 0 6 0 1 3700
 box -38 -48 774 592
@@ -2396,10 +2341,6 @@
 timestamp 1643856600
 transform 1 0 742 0 1 3700
 box -38 -48 774 592
-use sky130_fd_sc_hd__inv_1  sky130_fd_sc_hd__inv_1_3
-timestamp 1643856600
-transform 1 0 1018 0 1 3700
-box -38 -48 314 592
 use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_2
 timestamp 1643856600
 transform 1 0 1478 0 1 3700
@@ -2428,6 +2369,122 @@
 timestamp 1643856600
 transform 1 0 5894 0 1 3700
 box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_11
+timestamp 1643856600
+transform 1 0 -730 0 1 3700
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_12
+timestamp 1643856600
+transform 1 0 -1466 0 1 3700
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_13
+timestamp 1643856600
+transform 1 0 -2202 0 1 3700
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_14
+timestamp 1643856600
+transform 1 0 -1466 0 1 436
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_15
+timestamp 1643856600
+transform 1 0 -2202 0 1 436
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_16
+timestamp 1643856600
+transform 1 0 -1466 0 1 -2828
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_17
+timestamp 1643856600
+transform 1 0 -2202 0 1 -2828
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_18
+timestamp 1643856600
+transform 1 0 -1466 0 1 -6092
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_19
+timestamp 1643856600
+transform 1 0 -2202 0 1 -6092
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_20
+timestamp 1643856600
+transform 1 0 -1466 0 1 -9356
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_21
+timestamp 1643856600
+transform 1 0 -2202 0 1 -9356
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_22
+timestamp 1643856600
+transform 1 0 -1466 0 1 -12620
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_23
+timestamp 1643856600
+transform 1 0 -2202 0 1 -12620
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_24
+timestamp 1643856600
+transform 1 0 -1466 0 1 -15884
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_25
+timestamp 1643856600
+transform 1 0 -2202 0 1 -15884
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_26
+timestamp 1643856600
+transform 1 0 -1466 0 1 -19148
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_27
+timestamp 1643856600
+transform 1 0 -2202 0 1 -19148
+box -38 -48 774 592
+use sky130_fd_sc_hd__inv_1  sky130_fd_sc_hd__inv_1_0 
+timestamp 1643856600
+transform 1 0 190 0 1 3700
+box -38 -48 314 592
+use sky130_fd_sc_hd__inv_1  sky130_fd_sc_hd__inv_1_1
+timestamp 1643856600
+transform 1 0 466 0 1 3700
+box -38 -48 314 592
+use sky130_fd_sc_hd__inv_1  sky130_fd_sc_hd__inv_1_2
+timestamp 1643856600
+transform 1 0 742 0 1 3700
+box -38 -48 314 592
+use sky130_fd_sc_hd__inv_1  sky130_fd_sc_hd__inv_1_3
+timestamp 1643856600
+transform 1 0 1018 0 1 3700
+box -38 -48 314 592
+use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_0 
+timestamp 1643856600
+transform 1 0 6 0 1 3700
+box -38 -48 130 592
+use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_1
+timestamp 1643856600
+transform 1 0 -914 0 1 436
+box -38 -48 130 592
+use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_2
+timestamp 1643856600
+transform 1 0 -914 0 1 -2828
+box -38 -48 130 592
+use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_3
+timestamp 1643856600
+transform 1 0 -914 0 1 -6092
+box -38 -48 130 592
+use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_4
+timestamp 1643856600
+transform 1 0 -914 0 1 -9356
+box -38 -48 130 592
+use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_5
+timestamp 1643856600
+transform 1 0 -914 0 1 -12620
+box -38 -48 130 592
+use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_6
+timestamp 1643856600
+transform 1 0 -914 0 1 -15884
+box -38 -48 130 592
+use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_7
+timestamp 1643856600
+transform 1 0 -914 0 1 -19148
+box -38 -48 130 592
 << labels >>
 flabel metal2 s 250 3980 308 4292 1 FreeSerif 480 180 0 0 pu_cal_ctrl[0]
 port 13 n
diff --git a/mag/SSTL/n-leg.mag b/mag/SSTL/n-leg.mag
index 3ca5823..9a7f667 100644
--- a/mag/SSTL/n-leg.mag
+++ b/mag/SSTL/n-leg.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1646531211
+timestamp 1646792692
+<< checkpaint >>
+rect 76 -3567 8426 4363
 << pwell >>
 rect 1883 1071 1917 1105
 rect 3355 1071 3389 1105
@@ -441,9 +443,12 @@
 rect 6190 127 6224 161
 rect 6190 59 6224 93
 << psubdiff >>
+rect 1975 1071 2009 1105
+rect 2067 1071 2101 1105
 rect 6286 156 6519 180
 rect 6286 21 6519 45
 << psubdiffcont >>
+rect 2009 1071 2067 1105
 rect 6286 45 6519 156
 << poly >>
 rect 1854 249 6270 265
@@ -603,7 +608,6 @@
 << locali >>
 rect 1854 1071 1883 1105
 rect 1917 1071 1975 1105
-rect 2009 1071 2067 1105
 rect 2101 1071 2159 1105
 rect 2193 1071 2251 1105
 rect 2285 1071 2343 1105
@@ -1539,22 +1543,22 @@
 rect 4426 360 4438 412
 rect 4490 360 4522 412
 rect 4426 349 4522 360
-use n-leg_ctrl_fet_3  n-leg_ctrl_fet_3_0
-timestamp 1642734083
-transform 1 0 6404 0 1 727
-box -73 -107 73 107
-use n-leg_ctrl_fet_2  n-leg_ctrl_fet_2_0
-timestamp 1642733691
-transform 1 0 6104 0 1 847
-box -129 -153 221 91
-use n-leg_ctrl_fet_1  n-leg_ctrl_fet_1_0
-timestamp 1642732258
-transform 1 0 5164 0 -1 795
-box -129 -153 689 91
 use n-leg_ctrl_fet_0  n-leg_ctrl_fet_0_0
-timestamp 1642450972
+timestamp 1646792692
 transform 1 0 1991 0 -1 869
 box -129 -153 2945 91
+use n-leg_ctrl_fet_1  n-leg_ctrl_fet_1_0
+timestamp 1646792692
+transform 1 0 5164 0 -1 795
+box -129 -153 689 91
+use n-leg_ctrl_fet_2  n-leg_ctrl_fet_2_0
+timestamp 1646792692
+transform 1 0 6104 0 1 847
+box -129 -153 221 91
+use n-leg_ctrl_fet_3  n-leg_ctrl_fet_3_0
+timestamp 1646792692
+transform 1 0 6404 0 1 727
+box -73 -107 73 107
 use n-leg_polyres  n-leg_polyres_0
 timestamp 1642386543
 transform 0 1 4251 -1 0 398
diff --git a/mag/SSTL/p-leg.mag b/mag/SSTL/p-leg.mag
index 69dfae0..cb3097b 100644
--- a/mag/SSTL/p-leg.mag
+++ b/mag/SSTL/p-leg.mag
@@ -1,7 +1,14 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1646525656
+timestamp 1646792189
+<< checkpaint >>
+rect -3964 5581 10174 5999
+rect -3964 5384 10253 5581
+rect -3964 4862 10445 5384
+rect -3966 -2481 10445 4862
+rect -3966 -2642 10253 -2481
+rect -3966 -3746 10172 -2642
 << nwell >>
 rect -34 1604 6666 1925
 << pwell >>
@@ -18,12 +25,18 @@
 rect 6289 1857 6323 1881
 rect 6289 1773 6323 1823
 rect 6289 1706 6323 1739
+rect 217 1625 251 1659
+rect 309 1625 343 1659
+rect 493 537 527 571
+rect 585 537 619 571
 rect 6473 457 6507 490
 rect 6473 373 6507 423
 rect 6473 315 6507 339
 << nsubdiffcont >>
 rect 6289 1823 6323 1857
 rect 6289 1739 6323 1773
+rect 251 1625 309 1659
+rect 527 537 585 571
 rect 6473 423 6507 457
 rect 6473 339 6507 373
 << poly >>
@@ -305,8 +318,8 @@
 rect 6175 1306 6209 1340
 rect 76 871 242 923
 rect 3260 766 3330 833
-rect 3260 299 3330 366
-rect 76 209 242 261
+rect 3260 283 3330 350
+rect 76 193 242 245
 << metal1 >>
 rect 4 2203 6629 2234
 rect 4 2169 33 2203
@@ -526,14 +539,14 @@
 rect 6536 537 6565 571
 rect 6599 537 6628 571
 rect 6536 506 6628 537
-rect 3248 366 3342 372
-rect 3248 299 3260 366
-rect 3330 299 3342 366
-rect 3248 293 3342 299
-rect 64 261 254 267
-rect 64 209 76 261
-rect 242 209 254 261
-rect 64 203 254 209
+rect 3248 350 3342 356
+rect 3248 283 3260 350
+rect 3330 283 3342 350
+rect 3248 277 3342 283
+rect 64 245 254 251
+rect 64 193 76 245
+rect 242 193 254 245
+rect 64 187 254 193
 << via1 >>
 rect 3260 1957 3330 2067
 rect 3719 1804 3783 1872
@@ -544,8 +557,8 @@
 rect 3719 1193 3783 1249
 rect 76 871 242 923
 rect 3260 766 3330 833
-rect 3260 299 3330 366
-rect 76 209 242 261
+rect 3260 283 3330 350
+rect 76 193 242 245
 << metal2 >>
 rect 3260 2067 3330 2073
 rect 3260 1480 3330 1957
@@ -555,138 +568,62 @@
 rect 3719 1249 3783 1801
 rect 3719 1183 3783 1193
 rect 76 923 242 933
-rect 76 261 242 871
+rect 76 245 242 871
 rect 3260 833 3330 1174
-rect 3260 366 3330 766
-rect 3260 289 3330 299
-rect 76 199 242 209
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_2
-timestamp 1643856600
-transform 1 0 1476 0 1 10
-box -38 -48 774 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_1
-timestamp 1643856600
-transform 1 0 740 0 1 10
-box -38 -48 774 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_0
-timestamp 1643856600
-transform 1 0 4 0 1 10
-box -38 -48 774 592
-use p-leg_fet_16  p-leg_fet_16_4
-timestamp 1643664681
-transform 1 0 3103 0 -1 769
-box -1089 -161 1089 198
-use p-leg_fet_16  p-leg_fet_16_1
-timestamp 1643664681
-transform 1 0 3103 0 1 363
-box -1089 -161 1089 198
-use p-leg_fet_16  p-leg_fet_16_3
-timestamp 1643664681
-transform 1 0 1055 0 -1 769
-box -1089 -161 1089 198
-use p-leg_fet_16  p-leg_fet_16_0
-timestamp 1643664681
-transform 1 0 1055 0 1 363
-box -1089 -161 1089 198
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_5
-timestamp 1643856600
-transform 1 0 3684 0 1 10
-box -38 -48 774 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_4
-timestamp 1643856600
-transform 1 0 2948 0 1 10
-box -38 -48 774 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_3
-timestamp 1643856600
-transform 1 0 2212 0 1 10
-box -38 -48 774 592
-use p-leg_fet_16  p-leg_fet_16_5
-timestamp 1643664681
-transform 1 0 5151 0 -1 769
-box -1089 -161 1089 198
-use p-leg_fet_16  p-leg_fet_16_2
-timestamp 1643664681
-transform 1 0 5151 0 1 363
-box -1089 -161 1089 198
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_8
-timestamp 1643856600
-transform 1 0 5892 0 1 10
-box -38 -48 774 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_7
-timestamp 1643856600
-transform 1 0 5156 0 1 10
-box -38 -48 774 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_6
-timestamp 1643856600
-transform 1 0 4420 0 1 10
-box -38 -48 774 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_11
-timestamp 1643856600
-transform 1 0 1476 0 1 1098
-box -38 -48 774 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_9
-timestamp 1643856600
-transform 1 0 4 0 1 1098
-box -38 -48 774 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_10
-timestamp 1643856600
-transform 1 0 740 0 1 1098
-box -38 -48 774 592
-use p-leg_6  p-leg_6_2
+rect 3260 350 3330 766
+rect 3260 273 3330 283
+rect 76 183 242 193
+use p-leg_6  p-leg_6_0
 timestamp 1643158822
-transform 1 0 2594 0 -1 1415
+transform 1 0 1058 0 -1 1415
 box -1089 -161 -191 198
 use p-leg_6  p-leg_6_1
 timestamp 1643158822
 transform 1 0 1826 0 -1 1415
 box -1089 -161 -191 198
-use p-leg_6  p-leg_6_0
+use p-leg_6  p-leg_6_2
 timestamp 1643158822
-transform 1 0 1058 0 -1 1415
-box -1089 -161 -191 198
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_14
-timestamp 1643856600
-transform 1 0 3684 0 1 1098
-box -38 -48 774 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_12
-timestamp 1643856600
-transform 1 0 2212 0 1 1098
-box -38 -48 774 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_13
-timestamp 1643856600
-transform 1 0 2948 0 1 1098
-box -38 -48 774 592
-use p-leg_polyres  p-leg_polyres_0
-timestamp 1643152784
-transform 0 -1 3515 1 0 1197
-box -33 -253 33 253
-use p-leg_6  p-leg_6_4
-timestamp 1643158822
-transform 1 0 4852 0 -1 1341
+transform 1 0 2594 0 -1 1415
 box -1089 -161 -191 198
 use p-leg_6  p-leg_6_3
 timestamp 1643158822
 transform 1 0 3362 0 -1 1415
 box -1089 -161 -191 198
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_17
-timestamp 1643856600
-transform 1 0 5892 0 1 1098
-box -38 -48 774 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_15
-timestamp 1643856600
-transform 1 0 4420 0 1 1098
-box -38 -48 774 592
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_16
-timestamp 1643856600
-transform 1 0 5156 0 1 1098
-box -38 -48 774 592
+use p-leg_6  p-leg_6_4
+timestamp 1643158822
+transform 1 0 4852 0 -1 1341
+box -1089 -161 -191 198
 use p-leg_6  p-leg_6_5
 timestamp 1643158822
 transform 1 0 5620 0 -1 1341
 box -1089 -161 -191 198
-use p-leg_fet_16  p-leg_fet_16_8
+use p-leg_6  p-leg_6_6
+timestamp 1643158822
+transform 1 0 6512 0 1 1451
+box -1089 -161 -191 198
+use p-leg_fet_16  p-leg_fet_16_0
 timestamp 1643664681
-transform -1 0 1057 0 1 1869
+transform 1 0 1055 0 1 347
+box -1089 -161 1089 198
+use p-leg_fet_16  p-leg_fet_16_1
+timestamp 1643664681
+transform 1 0 3103 0 1 347
+box -1089 -161 1089 198
+use p-leg_fet_16  p-leg_fet_16_2
+timestamp 1643664681
+transform 1 0 5151 0 1 347
+box -1089 -161 1089 198
+use p-leg_fet_16  p-leg_fet_16_3
+timestamp 1643664681
+transform 1 0 1055 0 -1 769
+box -1089 -161 1089 198
+use p-leg_fet_16  p-leg_fet_16_4
+timestamp 1643664681
+transform 1 0 3103 0 -1 769
+box -1089 -161 1089 198
+use p-leg_fet_16  p-leg_fet_16_5
+timestamp 1643664681
+transform 1 0 5151 0 -1 769
 box -1089 -161 1089 198
 use p-leg_fet_16  p-leg_fet_16_6
 timestamp 1643664681
@@ -696,10 +633,86 @@
 timestamp 1643664681
 transform -1 0 5153 0 1 1869
 box -1089 -161 1089 198
-use p-leg_6  p-leg_6_6
-timestamp 1643158822
-transform 1 0 6512 0 1 1451
-box -1089 -161 -191 198
+use p-leg_fet_16  p-leg_fet_16_8
+timestamp 1643664681
+transform -1 0 1057 0 1 1869
+box -1089 -161 1089 198
+use p-leg_polyres  p-leg_polyres_0
+timestamp 1646792189
+transform 0 -1 3515 1 0 1197
+box -33 -253 33 253
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_0 
+timestamp 1646792189
+transform 1 0 4 0 1 10
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_1
+timestamp 1646792189
+transform 1 0 740 0 1 10
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_2
+timestamp 1646792189
+transform 1 0 1476 0 1 10
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_3
+timestamp 1646792189
+transform 1 0 2212 0 1 10
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_4
+timestamp 1646792189
+transform 1 0 2948 0 1 10
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_5
+timestamp 1646792189
+transform 1 0 3684 0 1 10
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_6
+timestamp 1646792189
+transform 1 0 4420 0 1 10
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_7
+timestamp 1646792189
+transform 1 0 5156 0 1 10
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_8
+timestamp 1646792189
+transform 1 0 5892 0 1 10
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_9
+timestamp 1646792189
+transform 1 0 4 0 1 1098
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_10
+timestamp 1646792189
+transform 1 0 740 0 1 1098
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_11
+timestamp 1646792189
+transform 1 0 1476 0 1 1098
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_12
+timestamp 1646792189
+transform 1 0 2212 0 1 1098
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_13
+timestamp 1646792189
+transform 1 0 2948 0 1 1098
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_14
+timestamp 1646792189
+transform 1 0 3684 0 1 1098
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_15
+timestamp 1646792189
+transform 1 0 4420 0 1 1098
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_16
+timestamp 1646792189
+transform 1 0 5156 0 1 1098
+box -38 -48 774 592
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_17
+timestamp 1646792189
+transform 1 0 5892 0 1 1098
+box -38 -48 774 592
 << labels >>
 flabel metal1 s 30 553 30 553 7 FreeSerif 640 0 0 0 VDD
 port 3 w
diff --git a/mag/cfg_shift_register.mag b/mag/cfg_shift_register.mag
index ee6d7fb..8673003 100644
--- a/mag/cfg_shift_register.mag
+++ b/mag/cfg_shift_register.mag
@@ -1,23 +1,37 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1646187848
+timestamp 1646794523
 << nwell >>
 rect -50 518 118 839
+rect 5819 594 6350 646
+rect 9819 594 10350 646
 << pwell >>
 rect -9 -183 77 -26
 << psubdiff >>
+rect 5905 -39 5939 -5
+rect 5997 -39 6031 -5
+rect 9905 -39 9939 -5
+rect 9997 -39 10031 -5
 rect 17 -99 51 -52
 rect 17 -157 51 -133
 << nsubdiff >>
 rect 17 771 51 795
 rect 17 678 51 737
 rect 17 620 51 644
+rect 5905 573 5939 607
+rect 5997 573 6031 607
+rect 9905 573 9939 607
+rect 9997 573 10031 607
 << psubdiffcont >>
+rect 5939 -39 5997 -5
+rect 9939 -39 9997 -5
 rect 17 -133 51 -99
 << nsubdiffcont >>
 rect 17 737 51 771
 rect 17 644 51 678
+rect 5939 573 5997 607
+rect 9939 573 9997 607
 << locali >>
 rect 5 771 63 806
 rect 5 737 17 771
@@ -26,11 +40,19 @@
 rect 5 644 17 678
 rect 51 644 63 678
 rect 5 573 63 644
+rect 5923 573 5939 607
+rect 5997 573 6013 607
+rect 9923 573 9939 607
+rect 9997 573 10013 607
 rect -12 539 17 573
 rect 51 539 80 573
 rect -12 -5 17 29
 rect 51 -5 80 29
 rect 5 -99 63 -5
+rect 5923 -39 5939 -5
+rect 5997 -39 6013 -5
+rect 9923 -39 9939 -5
+rect 9997 -39 10013 -5
 rect 5 -133 17 -99
 rect 51 -133 63 -99
 rect 5 -150 63 -133
@@ -268,36 +290,36 @@
 rect 8772 -36 8812 96
 rect 10244 -36 10284 96
 rect 11716 -36 11756 96
-use sky130_fd_sc_hd__dfxtp_1  sky130_fd_sc_hd__dfxtp_1_0 $PDKPATH/libs.ref/sky130_fd_sc_hd/mag
-timestamp 1644111581
+use sky130_fd_sc_hd__dfxtp_1  sky130_fd_sc_hd__dfxtp_1_0 ~/proj/caravan-project/pdk/sky130A/libs.ref/sky130_fd_sc_hd/mag
+timestamp 1646794523
 transform 1 0 -12 0 1 12
 box -38 -48 1510 592
 use sky130_fd_sc_hd__dfxtp_1  sky130_fd_sc_hd__dfxtp_1_1
-timestamp 1644111581
+timestamp 1646794523
 transform 1 0 1460 0 1 12
 box -38 -48 1510 592
 use sky130_fd_sc_hd__dfxtp_1  sky130_fd_sc_hd__dfxtp_1_2
-timestamp 1644111581
+timestamp 1646794523
 transform 1 0 2932 0 1 12
 box -38 -48 1510 592
 use sky130_fd_sc_hd__dfxtp_1  sky130_fd_sc_hd__dfxtp_1_3
-timestamp 1644111581
+timestamp 1646794523
 transform 1 0 4404 0 1 12
 box -38 -48 1510 592
 use sky130_fd_sc_hd__dfxtp_1  sky130_fd_sc_hd__dfxtp_1_4
-timestamp 1644111581
+timestamp 1646794523
 transform 1 0 5876 0 1 12
 box -38 -48 1510 592
 use sky130_fd_sc_hd__dfxtp_1  sky130_fd_sc_hd__dfxtp_1_5
-timestamp 1644111581
+timestamp 1646794523
 transform 1 0 7348 0 1 12
 box -38 -48 1510 592
 use sky130_fd_sc_hd__dfxtp_1  sky130_fd_sc_hd__dfxtp_1_6
-timestamp 1644111581
+timestamp 1646794523
 transform 1 0 8820 0 1 12
 box -38 -48 1510 592
 use sky130_fd_sc_hd__dfxtp_1  sky130_fd_sc_hd__dfxtp_1_7
-timestamp 1644111581
+timestamp 1646794523
 transform 1 0 10292 0 1 12
 box -38 -48 1510 592
 << labels >>
diff --git a/mag/proj_sstl_test.mag b/mag/proj_sstl_test.mag
index dcc8fa8..52b10f8 100644
--- a/mag/proj_sstl_test.mag
+++ b/mag/proj_sstl_test.mag
@@ -1,7 +1,12 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1646785351
+timestamp 1646793240
+<< checkpaint >>
+rect 9518 27436 37238 39404
+rect -3914 8052 37238 27436
+rect -3914 7508 16814 8052
+rect -3914 -3916 12950 7508
 << locali >>
 rect 22027 32313 23103 32425
 rect 22027 29049 23103 29161
@@ -1824,149 +1829,153 @@
 rect 28789 4311 33084 11984
 rect 8796 16 33084 4311
 use SSTL  SSTL_0 ~/proj/caravan-project/mag/./SSTL
-timestamp 1646785030
+timestamp 1646792692
 transform 1 0 2350 0 -1 4308
 box -2332 -19196 6668 4292
+use SSTL  SSTL_1
+timestamp 1646792692
+transform -1 0 20118 0 -1 16276
+box -2332 -19196 6668 4292
+use SSTL  SSTL_2
+timestamp 1646792692
+transform 1 0 26638 0 -1 16276
+box -2332 -19196 6668 4292
+use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_0 ~/proj/caravan-project/pdk/sky130A/libs.ref/sky130_fd_sc_hd/mag
+timestamp 1646787781
+transform -1 0 23608 0 1 12576
+box -38 -48 498 592
+use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_1
+timestamp 1646787781
+transform -1 0 23608 0 -1 15840
+box -38 -48 498 592
+use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_2
+timestamp 1646787781
+transform -1 0 23608 0 -1 19104
+box -38 -48 498 592
+use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_3
+timestamp 1646787781
+transform -1 0 23608 0 1 15840
+box -38 -48 498 592
+use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_4
+timestamp 1646787781
+transform -1 0 23608 0 -1 22368
+box -38 -48 498 592
+use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_5
+timestamp 1646787781
+transform -1 0 23608 0 1 19104
+box -38 -48 498 592
+use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_6
+timestamp 1646787781
+transform -1 0 23608 0 -1 25632
+box -38 -48 498 592
+use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_7
+timestamp 1646787781
+transform -1 0 23608 0 1 22368
+box -38 -48 498 592
+use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_8
+timestamp 1646787781
+transform -1 0 23608 0 -1 28896
+box -38 -48 498 592
+use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_9
+timestamp 1646787781
+transform -1 0 23608 0 1 25632
+box -38 -48 498 592
+use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_10
+timestamp 1646787781
+transform -1 0 23608 0 -1 32160
+box -38 -48 498 592
+use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_11
+timestamp 1646787781
+transform -1 0 23608 0 1 28896
+box -38 -48 498 592
+use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_12
+timestamp 1646787781
+transform -1 0 23608 0 -1 35424
+box -38 -48 498 592
+use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_13
+timestamp 1646787781
+transform -1 0 23608 0 1 32160
+box -38 -48 498 592
 use sky130_fd_sc_hd__clkbuf_2  sky130_fd_sc_hd__clkbuf_2_0 ~/proj/caravan-project/pdk/sky130A/libs.ref/sky130_fd_sc_hd/mag
-timestamp 1644111581
+timestamp 1646787781
 transform 1 0 9716 0 1 11488
 box -38 -48 406 592
 use sky130_fd_sc_hd__clkbuf_2  sky130_fd_sc_hd__clkbuf_2_1
-timestamp 1644111581
+timestamp 1646787781
 transform 1 0 10084 0 1 11488
 box -38 -48 406 592
 use sky130_fd_sc_hd__clkinv_2  sky130_fd_sc_hd__clkinv_2_0 ~/proj/caravan-project/pdk/sky130A/libs.ref/sky130_fd_sc_hd/mag
-timestamp 1644111581
+timestamp 1646787781
 transform 1 0 12384 0 1 11488
 box -38 -48 406 592
 use sky130_fd_sc_hd__mux4_1  sky130_fd_sc_hd__mux4_1_0 ~/proj/caravan-project/pdk/sky130A/libs.ref/sky130_fd_sc_hd/mag
-timestamp 1644111581
+timestamp 1646787781
 transform 1 0 10452 0 1 11488
 box -38 -48 1970 592
-use sky130_fd_sc_hd__tapvpwrvgnd_1#0  sky130_fd_sc_hd__tapvpwrvgnd_1_0 ~/proj/caravan-project/pdk/sky130A/libs.ref/sky130_fd_sc_hd/mag
-timestamp 1644111581
+use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_0 ~/proj/caravan-project/pdk/sky130A/libs.ref/sky130_fd_sc_hd/mag
+timestamp 1646787781
 transform 1 0 12752 0 1 11488
 box -38 -48 130 592
-use SSTL  SSTL_1
-timestamp 1646785030
-transform -1 0 20118 0 -1 16276
-box -2332 -19196 6668 4292
-use sky130_fd_sc_hd__tapvpwrvgnd_1#0  sky130_fd_sc_hd__tapvpwrvgnd_1_4
-timestamp 1644111581
-transform 1 0 23608 0 1 15840
-box -38 -48 130 592
-use sky130_fd_sc_hd__tapvpwrvgnd_1#0  sky130_fd_sc_hd__tapvpwrvgnd_1_2
-timestamp 1644111581
-transform 1 0 23608 0 -1 15840
-box -38 -48 130 592
-use sky130_fd_sc_hd__tapvpwrvgnd_1#0  sky130_fd_sc_hd__tapvpwrvgnd_1_1
-timestamp 1644111581
+use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_1
+timestamp 1646787781
 transform 1 0 23608 0 1 12576
 box -38 -48 130 592
-use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_3 ~/proj/caravan-project/pdk/sky130A/libs.ref/sky130_fd_sc_hd/mag
-timestamp 1644111581
-transform -1 0 23608 0 1 15840
-box -38 -48 498 592
-use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_1
-timestamp 1644111581
-transform -1 0 23608 0 -1 15840
-box -38 -48 498 592
-use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_0
-timestamp 1644111581
-transform -1 0 23608 0 1 12576
-box -38 -48 498 592
-use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_2
-timestamp 1644111581
-transform -1 0 23608 0 -1 19104
-box -38 -48 498 592
-use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_5
-timestamp 1644111581
-transform -1 0 23608 0 1 19104
-box -38 -48 498 592
-use sky130_fd_sc_hd__tapvpwrvgnd_1#0  sky130_fd_sc_hd__tapvpwrvgnd_1_3
-timestamp 1644111581
+use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_2
+timestamp 1646787781
+transform 1 0 23608 0 -1 15840
+box -38 -48 130 592
+use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_3
+timestamp 1646787781
 transform 1 0 23608 0 -1 19104
 box -38 -48 130 592
-use sky130_fd_sc_hd__tapvpwrvgnd_1#0  sky130_fd_sc_hd__tapvpwrvgnd_1_6
-timestamp 1644111581
-transform 1 0 23608 0 1 19104
+use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_4
+timestamp 1646787781
+transform 1 0 23608 0 1 15840
 box -38 -48 130 592
-use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_4
-timestamp 1644111581
-transform -1 0 23608 0 -1 22368
-box -38 -48 498 592
-use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_7
-timestamp 1644111581
-transform -1 0 23608 0 1 22368
-box -38 -48 498 592
-use sky130_fd_sc_hd__tapvpwrvgnd_1#0  sky130_fd_sc_hd__tapvpwrvgnd_1_5
-timestamp 1644111581
+use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_5
+timestamp 1646787781
 transform 1 0 23608 0 -1 22368
 box -38 -48 130 592
-use sky130_fd_sc_hd__tapvpwrvgnd_1#0  sky130_fd_sc_hd__tapvpwrvgnd_1_8
-timestamp 1644111581
-transform 1 0 23608 0 1 22368
+use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_6
+timestamp 1646787781
+transform 1 0 23608 0 1 19104
 box -38 -48 130 592
-use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_6
-timestamp 1644111581
-transform -1 0 23608 0 -1 25632
-box -38 -48 498 592
-use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_9
-timestamp 1644111581
-transform -1 0 23608 0 1 25632
-box -38 -48 498 592
-use sky130_fd_sc_hd__tapvpwrvgnd_1#0  sky130_fd_sc_hd__tapvpwrvgnd_1_7
-timestamp 1644111581
+use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_7
+timestamp 1646787781
 transform 1 0 23608 0 -1 25632
 box -38 -48 130 592
-use sky130_fd_sc_hd__tapvpwrvgnd_1#0  sky130_fd_sc_hd__tapvpwrvgnd_1_10
-timestamp 1644111581
-transform 1 0 23608 0 1 25632
+use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_8
+timestamp 1646787781
+transform 1 0 23608 0 1 22368
 box -38 -48 130 592
-use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_8
-timestamp 1644111581
-transform -1 0 23608 0 -1 28896
-box -38 -48 498 592
-use sky130_fd_sc_hd__tapvpwrvgnd_1#0  sky130_fd_sc_hd__tapvpwrvgnd_1_9
-timestamp 1644111581
+use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_9
+timestamp 1646787781
 transform 1 0 23608 0 -1 28896
 box -38 -48 130 592
-use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_11
-timestamp 1644111581
-transform -1 0 23608 0 1 28896
-box -38 -48 498 592
-use sky130_fd_sc_hd__tapvpwrvgnd_1#0  sky130_fd_sc_hd__tapvpwrvgnd_1_12
-timestamp 1644111581
-transform 1 0 23608 0 1 28896
+use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_10
+timestamp 1646787781
+transform 1 0 23608 0 1 25632
 box -38 -48 130 592
-use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_10
-timestamp 1644111581
-transform -1 0 23608 0 -1 32160
-box -38 -48 498 592
-use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_13
-timestamp 1644111581
-transform -1 0 23608 0 1 32160
-box -38 -48 498 592
-use sky130_fd_sc_hd__tapvpwrvgnd_1#0  sky130_fd_sc_hd__tapvpwrvgnd_1_11
-timestamp 1644111581
+use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_11
+timestamp 1646787781
 transform 1 0 23608 0 -1 32160
 box -38 -48 130 592
-use sky130_fd_sc_hd__tapvpwrvgnd_1#0  sky130_fd_sc_hd__tapvpwrvgnd_1_14
-timestamp 1644111581
-transform 1 0 23608 0 1 32160
+use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_12
+timestamp 1646787781
+transform 1 0 23608 0 1 28896
 box -38 -48 130 592
-use sky130_fd_sc_hd__and2_1  sky130_fd_sc_hd__and2_1_12
-timestamp 1644111581
-transform -1 0 23608 0 -1 35424
-box -38 -48 498 592
-use sky130_fd_sc_hd__tapvpwrvgnd_1#0  sky130_fd_sc_hd__tapvpwrvgnd_1_13
-timestamp 1644111581
+use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_13
+timestamp 1646787781
 transform 1 0 23608 0 -1 35424
 box -38 -48 130 592
-use SSTL  SSTL_2
-timestamp 1646785030
-transform 1 0 26638 0 -1 16276
-box -2332 -19196 6668 4292
+use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_14
+timestamp 1646787781
+transform 1 0 23608 0 1 32160
+box -38 -48 130 592
+use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_15
+timestamp 1646787781
+transform 1 0 9624 0 1 11488
+box -38 -48 130 592
 << labels >>
 flabel metal2 -276 16 -217 112 1 FreeSerif 112 0 0 0 rx_leg_ctrl[0]
 port 11 n
diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag
index 1df4374..d9fb3d0 100644
--- a/mag/user_analog_project_wrapper.mag
+++ b/mag/user_analog_project_wrapper.mag
@@ -1,7 +1,12 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1646785389
+timestamp 1646794558
+<< checkpaint >>
+rect 11573 647465 53167 689591
+rect 3138 647230 58204 647465
+rect 3068 638726 58296 647230
+rect 3138 638579 58204 638726
 << metal1 >>
 rect 7241 643202 7251 643298
 rect 7469 643202 7479 643298
@@ -1518,33 +1523,33 @@
 rect 584000 0 584100 704000
 rect -100 -100 584100 0
 use cfg_shift_register  cfg_shift_register_0
-timestamp 1646187848
+timestamp 1646794523
 transform 1 0 42470 0 1 642694
 box -72 -183 11802 839
 use cfg_shift_register  cfg_shift_register_1
-timestamp 1646187848
+timestamp 1646794523
 transform 1 0 30694 0 1 642694
 box -72 -183 11802 839
 use cfg_shift_register  cfg_shift_register_2
-timestamp 1646187848
+timestamp 1646794523
 transform 1 0 18918 0 1 642694
 box -72 -183 11802 839
 use cfg_shift_register  cfg_shift_register_3
-timestamp 1646187848
+timestamp 1646794523
 transform 1 0 7142 0 1 642694
 box -72 -183 11802 839
-use sky130_fd_sc_hd__tapvpwrvgnd_1#0  sky130_fd_sc_hd__tapvpwrvgnd_1_1 ~/proj/caravan-project/pdk/sky130A/libs.ref/sky130_fd_sc_hd/mag
-timestamp 1644111581
-transform 1 0 7038 0 1 642706
-box -38 -48 130 592
-use sky130_fd_sc_hd__tapvpwrvgnd_1#0  sky130_fd_sc_hd__tapvpwrvgnd_1_0
-timestamp 1644111581
-transform 1 0 54234 0 1 642706
-box -38 -48 130 592
 use proj_sstl_test  proj_sstl_test_0
-timestamp 1646785351
+timestamp 1646793240
 transform 1 0 15929 0 1 645492
 box -424 16 33306 40167
+use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_0 ~/proj/caravan-project/pdk/sky130A/libs.ref/sky130_fd_sc_hd/mag
+timestamp 1646787781
+transform 1 0 54234 0 1 642706
+box -38 -48 130 592
+use sky130_fd_sc_hd__tapvpwrvgnd_1  sky130_fd_sc_hd__tapvpwrvgnd_1_1
+timestamp 1646787781
+transform 1 0 7038 0 1 642706
+box -38 -48 130 592
 << labels >>
 flabel metal3 s 583520 269230 584800 269342 0 FreeSans 1120 0 0 0 gpio_analog[0]
 port 0 nsew signal bidirectional