decision feedback circuit
diff --git a/comparator/comparator-decision.spice b/comparator/comparator-decision.spice
index e7c2132..b6f5d85 100644
--- a/comparator/comparator-decision.spice
+++ b/comparator/comparator-decision.spice
@@ -3,17 +3,36 @@
.subckt comparator-decision VPAMP VNAMP VOP VON VGND VPWR
* voltage to current
-X0 VPWR VPAMP VOP VPWR sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+6u l=0.5e+6u
-X1 VPWR VNAMP VON VPWR sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+6u l=0.5e+6u
+* X0 VPWR VPAMP VOP VPWR sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+6u l=0.5e+6u
+* X1 VPWR VNAMP VON VPWR sky130_fd_pr__pfet_g5v0d10v5 w=1.5e+6u l=0.5e+6u
+*
+* * decision feedback
+* X2 VOP VOP ISINK VGND sky130_fd_pr__nfet_03v3_nvt w=1e+6u l=0.6e+6u
+* X3 VOP VON ISINK VGND sky130_fd_pr__nfet_03v3_nvt w=1e+6u l=0.6e+6u
+*
+* X4 VON VOP ISINK VGND sky130_fd_pr__nfet_03v3_nvt w=1e+6u l=0.6e+6u
+* X5 VON VON ISINK VGND sky130_fd_pr__nfet_03v3_nvt w=1e+6u l=0.6e+6u
+*
+* * current sink
+* X6 ISINK ISINK VGND VGND sky130_fd_pr__nfet_03v3_nvt w=1e+6u l=0.6e+6u
-* decision feedback
-X2 VOP VOP ISINK VGND sky130_fd_pr__nfet_03v3_nvt w=1e+6u l=0.6e+6u
-X3 VOP VON ISINK VGND sky130_fd_pr__nfet_03v3_nvt w=1e+6u l=0.6e+6u
+* extracted
+X0 VPWR VPWR VPWR VPWR sky130_fd_pr__pfet_g5v0d10v5 ad=-0 pd=0 as=-0 ps=0 w=1.5e+06u l=500000u
+X1 VPWR VPWR VPWR VPWR sky130_fd_pr__pfet_g5v0d10v5 ad=-0 pd=0 as=-0 ps=0 w=1.5e+06u l=500000u
+X2 VOP VPAMP VPWR VPWR sky130_fd_pr__pfet_g5v0d10v5 ad=0 pd=0 as=-0 ps=0 w=1.5e+06u l=500000u
+X3 VON VNAMP VPWR VPWR sky130_fd_pr__pfet_g5v0d10v5 ad=0 pd=0 as=-0 ps=0 w=1.5e+06u l=500000u
+X4 ISINK VOP VOP VGND sky130_fd_pr__nfet_03v3_nvt ad=-0 pd=0 as=0 ps=0 w=1e+06u l=600000u
+X5 VGND VGND VGND VGND sky130_fd_pr__nfet_03v3_nvt ad=-0 pd=0 as=-0 ps=0 w=1e+06u l=600000u
+X6 ISINK VON VON VGND sky130_fd_pr__nfet_03v3_nvt ad=-0 pd=0 as=0 ps=0 w=1e+06u l=600000u
+X7 ISINK VOP VON VGND sky130_fd_pr__nfet_03v3_nvt ad=-0 pd=0 as=0 ps=0 w=1e+06u l=600000u
+X8 ISINK VON VOP VGND sky130_fd_pr__nfet_03v3_nvt ad=-0 pd=0 as=0 ps=0 w=1e+06u l=600000u
+X9 VGND VGND VGND VGND sky130_fd_pr__nfet_03v3_nvt ad=-0 pd=0 as=-0 ps=0 w=1e+06u l=600000u
+X10 VGND ISINK ISINK VGND sky130_fd_pr__nfet_03v3_nvt ad=-0 pd=0 as=-0 ps=0 w=1e+06u l=600000u
+X11 VGND VGND VGND VGND sky130_fd_pr__nfet_03v3_nvt ad=-0 pd=0 as=-0 ps=0 w=1e+06u l=600000u
+X12 VGND VGND VGND VGND sky130_fd_pr__nfet_03v3_nvt ad=-0 pd=0 as=-0 ps=0 w=1e+06u l=600000u
+C0 VPWR VGND 6.67fF
+C1 ISINK VGND 2.29fF
+C2 VON VGND 2.41fF
-X4 VON VOP ISINK VGND sky130_fd_pr__nfet_03v3_nvt w=1e+6u l=0.6e+6u
-X5 VON VON ISINK VGND sky130_fd_pr__nfet_03v3_nvt w=1e+6u l=0.6e+6u
-
-* current sink
-X6 ISINK ISINK VGND VGND sky130_fd_pr__nfet_03v3_nvt w=1e+6u l=0.6e+6u
.ends
\ No newline at end of file
diff --git a/comparator/decision.mag b/comparator/decision.mag
new file mode 100644
index 0000000..86a7bd7
--- /dev/null
+++ b/comparator/decision.mag
@@ -0,0 +1,134 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1632337456
+<< nwell >>
+rect 60 1720 270 1770
+rect 60 1190 270 1230
+rect 40 1180 270 1190
+rect 40 1170 120 1180
+rect 40 1130 120 1140
+rect 40 1110 270 1130
+rect 40 1060 120 1110
+rect 280 740 370 1040
+<< pwell >>
+rect 700 960 760 1060
+rect 700 700 860 710
+rect 700 360 780 680
+<< locali >>
+rect 640 2480 720 2500
+rect 1020 2480 1090 2500
+rect 60 2320 360 2340
+rect 10 1810 420 2310
+rect 640 2060 1090 2480
+rect 410 1800 420 1810
+rect 700 1880 860 1960
+rect 1200 1850 1280 1870
+rect 1580 1850 1640 1870
+rect 700 1610 860 1700
+rect 10 1340 130 1510
+rect 700 1270 760 1610
+rect 960 1330 1030 1850
+rect 1200 1430 1640 1850
+rect 100 1190 270 1230
+rect 60 1180 270 1190
+rect 700 1200 920 1220
+rect 700 1180 900 1200
+rect 60 1120 270 1130
+rect 100 1080 270 1120
+rect 700 1060 740 1180
+rect 10 810 130 980
+rect 700 710 760 1060
+rect 960 990 970 1330
+rect 1500 1060 1650 1260
+rect 700 620 860 710
+rect 10 0 420 510
+rect 960 580 1030 990
+rect 950 460 1030 580
+rect 1210 450 1650 890
+rect 700 360 860 440
+rect 640 -180 1090 260
+<< viali >>
+rect 720 2480 1020 2580
+rect 60 2340 360 2440
+rect 700 1700 860 1880
+rect 1280 1850 1580 1950
+rect 270 1270 370 1580
+rect 60 1190 100 1230
+rect 60 1080 100 1120
+rect 830 1080 890 1140
+rect 280 740 370 1040
+rect 970 990 1030 1330
+rect 1270 990 1430 1330
+rect 700 440 860 620
+<< metal1 >>
+rect 40 2440 380 2620
+rect 700 2580 1600 2620
+rect 700 2480 720 2580
+rect 1020 2480 1600 2580
+rect 700 2460 1600 2480
+rect 40 2340 60 2440
+rect 360 2340 380 2440
+rect 40 2320 380 2340
+rect 1260 1950 1600 2460
+rect 680 1880 910 1900
+rect 680 1860 700 1880
+rect 250 1720 700 1860
+rect 250 1580 390 1720
+rect 680 1700 700 1720
+rect 860 1700 910 1880
+rect 1260 1850 1280 1950
+rect 1580 1850 1600 1950
+rect 1260 1830 1600 1850
+rect 680 1680 910 1700
+rect 250 1270 270 1580
+rect 370 1270 390 1580
+rect 250 1250 390 1270
+rect -120 1230 120 1250
+rect -120 1190 60 1230
+rect 100 1190 120 1230
+rect -120 1170 120 1190
+rect 810 1140 910 1680
+rect -120 1120 120 1140
+rect -120 1080 60 1120
+rect 100 1080 120 1120
+rect -120 1060 120 1080
+rect 810 1080 830 1140
+rect 890 1080 910 1140
+rect 810 1060 910 1080
+rect 950 1330 1450 1350
+rect 250 1040 390 1060
+rect 250 740 280 1040
+rect 370 740 390 1040
+rect 950 990 970 1330
+rect 1030 990 1270 1330
+rect 1430 990 1450 1330
+rect 950 970 1450 990
+rect 250 600 390 740
+rect 680 620 880 640
+rect 680 600 700 620
+rect 250 460 700 600
+rect 670 440 700 460
+rect 860 440 880 620
+rect 670 420 880 440
+use sky130_fd_pr__nfet_03v3_nvt_NAHJCF sky130_fd_pr__nfet_03v3_nvt_NAHJCF_0
+timestamp 1632334879
+transform 1 0 1423 0 1 1161
+box -288 -776 288 776
+use sky130_fd_pr__nfet_03v3_nvt_BKHJCF sky130_fd_pr__nfet_03v3_nvt_BKHJCF_0
+timestamp 1632337456
+transform 1 0 863 0 1 1158
+box -288 -1403 288 1403
+use sky130_fd_pr__pfet_g5v0d10v5_CABTE7 sky130_fd_pr__pfet_g5v0d10v5_CABTE7_0
+timestamp 1632332974
+transform 1 0 213 0 1 1156
+box -308 -1251 308 1251
+<< labels >>
+rlabel metal1 40 2580 380 2620 1 VPWR
+rlabel metal1 250 1250 390 1600 1 VOP
+rlabel metal1 250 720 390 1060 1 VON
+rlabel metal1 -120 1170 -100 1250 1 VPAMP
+rlabel metal1 -120 1060 -100 1140 1 VNAMP
+rlabel metal1 1250 970 1450 1350 1 ISINK
+rlabel metal1 700 2580 1600 2620 1 VGND
+<< end >>
diff --git a/comparator/decision.spice b/comparator/decision.spice
new file mode 100644
index 0000000..d3908e3
--- /dev/null
+++ b/comparator/decision.spice
@@ -0,0 +1,20 @@
+* SPICE3 file created from /mnt/c/Users/Harry/magic-practice/caravel_user_project_analog/comparator/decision.ext - technology: sky130A
+
+.option scale=1u
+
+X0 VPWR VPWR VPWR VPWR sky130_fd_pr__pfet_g5v0d10v5 ad=-0 pd=0 as=-0 ps=0 w=1.5e+06 l=500000
+X1 VPWR VPWR VPWR VPWR sky130_fd_pr__pfet_g5v0d10v5 ad=-0 pd=0 as=-0 ps=0 w=1.5e+06 l=500000
+X2 VOP VPAMP VPWR VPWR sky130_fd_pr__pfet_g5v0d10v5 ad=0 pd=0 as=-0 ps=0 w=1.5e+06 l=500000
+X3 VON VNAMP VPWR VPWR sky130_fd_pr__pfet_g5v0d10v5 ad=0 pd=0 as=-0 ps=0 w=1.5e+06 l=500000
+X4 ISINK VOP VOP VGND sky130_fd_pr__nfet_03v3_nvt ad=-0 pd=0 as=0 ps=0 w=1e+06 l=600000
+X5 VGND VGND VGND VGND sky130_fd_pr__nfet_03v3_nvt ad=-0 pd=0 as=-0 ps=0 w=1e+06 l=600000
+X6 ISINK VON VON VGND sky130_fd_pr__nfet_03v3_nvt ad=-0 pd=0 as=0 ps=0 w=1e+06 l=600000
+X7 ISINK VOP VON VGND sky130_fd_pr__nfet_03v3_nvt ad=-0 pd=0 as=0 ps=0 w=1e+06 l=600000
+X8 ISINK VON VOP VGND sky130_fd_pr__nfet_03v3_nvt ad=-0 pd=0 as=0 ps=0 w=1e+06 l=600000
+X9 VGND VGND VGND VGND sky130_fd_pr__nfet_03v3_nvt ad=-0 pd=0 as=-0 ps=0 w=1e+06 l=600000
+X10 VGND ISINK ISINK VGND sky130_fd_pr__nfet_03v3_nvt ad=-0 pd=0 as=-0 ps=0 w=1e+06 l=600000
+X11 VGND VGND VGND VGND sky130_fd_pr__nfet_03v3_nvt ad=-0 pd=0 as=-0 ps=0 w=1e+06 l=600000
+X12 VGND VGND VGND VGND sky130_fd_pr__nfet_03v3_nvt ad=-0 pd=0 as=-0 ps=0 w=1e+06 l=600000
+C0 VPWR VGND 6.67fF
+C1 ISINK VGND 2.29fF
+C2 VON VGND 2.41fF
diff --git a/comparator/preamp.mag b/comparator/preamp.mag
index 3bf8438..12dc987 100644
--- a/comparator/preamp.mag
+++ b/comparator/preamp.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1632245862
+timestamp 1632332974
<< nwell >>
rect 60 1210 150 1540
rect 0 1170 150 1210
@@ -129,25 +129,25 @@
rect 840 840 860 1020
rect 950 840 970 1020
rect 840 820 970 840
+use sky130_fd_pr__pfet_g5v0d10v5_CABTE7 sky130_fd_pr__pfet_g5v0d10v5_CABTE7_0
+timestamp 1632332974
+transform 1 0 53 0 1 1136
+box -308 -1251 308 1251
+use sky130_fd_pr__nfet_03v3_nvt_ZJHJCF sky130_fd_pr__nfet_03v3_nvt_ZJHJCF_0
+timestamp 1632332784
+transform 1 0 783 0 1 1140
+box -288 -985 288 985
use sky130_fd_pr__nfet_03v3_nvt_DWHJCV sky130_fd_pr__nfet_03v3_nvt_DWHJCV_0
timestamp 1632244313
transform 1 0 1532 0 1 1151
box -377 -776 377 776
-use sky130_fd_pr__nfet_03v3_nvt_ZJHJCF sky130_fd_pr__nfet_03v3_nvt_ZJHJCF_0
-timestamp 1632244518
-transform 1 0 783 0 1 1140
-box -288 -985 288 985
-use sky130_fd_pr__pfet_g5v0d10v5_CABTE7 sky130_fd_pr__pfet_g5v0d10v5_CABTE7_0
-timestamp 1632243750
-transform 1 0 53 0 1 1136
-box -308 -1251 308 1251
<< labels >>
rlabel metal1 640 2380 1760 2460 1 VGND
rlabel metal1 -80 2420 180 2460 1 VPWR
rlabel metal1 1480 1100 1580 1200 1 VI
rlabel metal1 1380 1270 1690 1350 1 BIASN
-rlabel metal1 390 1330 460 1460 1 VPAMP
-rlabel metal1 390 820 460 950 1 VNAMP
rlabel metal1 600 1160 680 1230 1 VP
rlabel metal1 600 1050 680 1120 1 VN
+rlabel metal1 610 1330 710 1460 1 VPAMP
+rlabel metal1 610 820 710 950 1 VNAMP
<< end >>
diff --git a/comparator/simulation.spice b/comparator/simulation.spice
index 5f38b23..94f93e4 100644
--- a/comparator/simulation.spice
+++ b/comparator/simulation.spice
@@ -19,21 +19,22 @@
Vbias BIASN VGND 0.3
VNin VN VGND 1.5
-VPin VP VGND 1.5
-* create pulse
+
+* create VP-in
*VPin VP VGND pulse(0 3 1p 1n 1n 1n 2n)
-*VPin VP VGND SINE(1.5 0.01 10Meg)
+VPin VP VGND SINE(1.5 0.1 100Meg)
+*VPin VP VGND 1.5
-*.tran 10e-12 200e-09 0e-00
-.dc VPin 0 3 0.002 VNin 0 3 0.2
+.tran 10e-12 20e-09 0e-00
+*.dc VPin 0 3 0.002 VNin 0 3 0.2
.control
run
set color0 = white
set color1 = black
plot VOUT
-*plot VP VN VOUT VPWR
+plot VP VN VOUT VPWR
*plot VPAMP VNAMP VI
*plot VOP VON
*plot i(Vdd3v3)
diff --git a/comparator/sky130_fd_pr__nfet_03v3_nvt_BKHJCF.mag b/comparator/sky130_fd_pr__nfet_03v3_nvt_BKHJCF.mag
new file mode 100644
index 0000000..21d2929
--- /dev/null
+++ b/comparator/sky130_fd_pr__nfet_03v3_nvt_BKHJCF.mag
@@ -0,0 +1,222 @@
+magic
+tech sky130A
+magscale 1 2
+timestamp 1632337456
+<< pwell >>
+rect -288 -1403 288 1403
+<< nnmos >>
+rect -60 945 60 1145
+rect -60 527 60 727
+rect -60 109 60 309
+rect -60 -309 60 -109
+rect -60 -727 60 -527
+rect -60 -1145 60 -945
+<< mvndiff >>
+rect -118 1133 -60 1145
+rect -118 957 -106 1133
+rect -72 957 -60 1133
+rect -118 945 -60 957
+rect 60 1133 118 1145
+rect 60 957 72 1133
+rect 106 957 118 1133
+rect 60 945 118 957
+rect -118 715 -60 727
+rect -118 539 -106 715
+rect -72 539 -60 715
+rect -118 527 -60 539
+rect 60 715 118 727
+rect 60 539 72 715
+rect 106 539 118 715
+rect 60 527 118 539
+rect -118 297 -60 309
+rect -118 121 -106 297
+rect -72 121 -60 297
+rect -118 109 -60 121
+rect 60 297 118 309
+rect 60 121 72 297
+rect 106 121 118 297
+rect 60 109 118 121
+rect -118 -121 -60 -109
+rect -118 -297 -106 -121
+rect -72 -297 -60 -121
+rect -118 -309 -60 -297
+rect 60 -121 118 -109
+rect 60 -297 72 -121
+rect 106 -297 118 -121
+rect 60 -309 118 -297
+rect -118 -539 -60 -527
+rect -118 -715 -106 -539
+rect -72 -715 -60 -539
+rect -118 -727 -60 -715
+rect 60 -539 118 -527
+rect 60 -715 72 -539
+rect 106 -715 118 -539
+rect 60 -727 118 -715
+rect -118 -957 -60 -945
+rect -118 -1133 -106 -957
+rect -72 -1133 -60 -957
+rect -118 -1145 -60 -1133
+rect 60 -957 118 -945
+rect 60 -1133 72 -957
+rect 106 -1133 118 -957
+rect 60 -1145 118 -1133
+<< mvndiffc >>
+rect -106 957 -72 1133
+rect 72 957 106 1133
+rect -106 539 -72 715
+rect 72 539 106 715
+rect -106 121 -72 297
+rect 72 121 106 297
+rect -106 -297 -72 -121
+rect 72 -297 106 -121
+rect -106 -715 -72 -539
+rect 72 -715 106 -539
+rect -106 -1133 -72 -957
+rect 72 -1133 106 -957
+<< mvpsubdiff >>
+rect -252 1355 252 1367
+rect -252 1321 -144 1355
+rect 144 1321 252 1355
+rect -252 1309 252 1321
+rect -252 1259 -194 1309
+rect -252 -1259 -240 1259
+rect -206 -1259 -194 1259
+rect 194 1259 252 1309
+rect -252 -1309 -194 -1259
+rect 194 -1259 206 1259
+rect 240 -1259 252 1259
+rect 194 -1309 252 -1259
+rect -252 -1321 252 -1309
+rect -252 -1355 -144 -1321
+rect 144 -1355 252 -1321
+rect -252 -1367 252 -1355
+<< mvpsubdiffcont >>
+rect -144 1321 144 1355
+rect -240 -1259 -206 1259
+rect 206 -1259 240 1259
+rect -144 -1355 144 -1321
+<< poly >>
+rect -60 1217 60 1233
+rect -60 1183 -44 1217
+rect 44 1183 60 1217
+rect -60 1145 60 1183
+rect -60 907 60 945
+rect -60 873 -44 907
+rect 44 873 60 907
+rect -60 857 60 873
+rect -60 799 60 815
+rect -60 765 -44 799
+rect 44 765 60 799
+rect -60 727 60 765
+rect -60 489 60 527
+rect -60 455 -44 489
+rect 44 455 60 489
+rect -60 439 60 455
+rect -60 381 60 397
+rect -60 347 -44 381
+rect 44 347 60 381
+rect -60 309 60 347
+rect -60 71 60 109
+rect -60 37 -44 71
+rect 44 37 60 71
+rect -60 21 60 37
+rect -60 -37 60 -21
+rect -60 -71 -44 -37
+rect 44 -71 60 -37
+rect -60 -109 60 -71
+rect -60 -347 60 -309
+rect -60 -381 -44 -347
+rect 44 -381 60 -347
+rect -60 -397 60 -381
+rect -60 -455 60 -439
+rect -60 -489 -44 -455
+rect 44 -489 60 -455
+rect -60 -527 60 -489
+rect -60 -765 60 -727
+rect -60 -799 -44 -765
+rect 44 -799 60 -765
+rect -60 -815 60 -799
+rect -60 -873 60 -857
+rect -60 -907 -44 -873
+rect 44 -907 60 -873
+rect -60 -945 60 -907
+rect -60 -1183 60 -1145
+rect -60 -1217 -44 -1183
+rect 44 -1217 60 -1183
+rect -60 -1233 60 -1217
+<< polycont >>
+rect -44 1183 44 1217
+rect -44 873 44 907
+rect -44 765 44 799
+rect -44 455 44 489
+rect -44 347 44 381
+rect -44 37 44 71
+rect -44 -71 44 -37
+rect -44 -381 44 -347
+rect -44 -489 44 -455
+rect -44 -799 44 -765
+rect -44 -907 44 -873
+rect -44 -1217 44 -1183
+<< locali >>
+rect -240 1321 -144 1355
+rect 144 1321 240 1355
+rect -240 1259 -206 1321
+rect 206 1259 240 1321
+rect -60 1183 -44 1217
+rect 44 1183 60 1217
+rect -106 1133 -72 1149
+rect -106 941 -72 957
+rect 72 1133 106 1149
+rect 72 941 106 957
+rect -60 873 -44 907
+rect 44 873 60 907
+rect -60 765 -44 799
+rect 44 765 60 799
+rect -106 715 -72 731
+rect -106 523 -72 539
+rect 72 715 106 731
+rect 72 523 106 539
+rect -60 455 -44 489
+rect 44 455 60 489
+rect -60 347 -44 381
+rect 44 347 60 381
+rect -106 297 -72 313
+rect -106 105 -72 121
+rect 72 297 106 313
+rect 72 105 106 121
+rect -60 37 -44 71
+rect 44 37 60 71
+rect -60 -71 -44 -37
+rect 44 -71 60 -37
+rect -106 -121 -72 -105
+rect -106 -313 -72 -297
+rect 72 -121 106 -105
+rect 72 -313 106 -297
+rect -60 -381 -44 -347
+rect 44 -381 60 -347
+rect -60 -489 -44 -455
+rect 44 -489 60 -455
+rect -106 -539 -72 -523
+rect -106 -731 -72 -715
+rect 72 -539 106 -523
+rect 72 -731 106 -715
+rect -60 -799 -44 -765
+rect 44 -799 60 -765
+rect -60 -907 -44 -873
+rect 44 -907 60 -873
+rect -106 -957 -72 -941
+rect -106 -1149 -72 -1133
+rect 72 -957 106 -941
+rect 72 -1149 106 -1133
+rect -60 -1217 -44 -1183
+rect 44 -1217 60 -1183
+rect -240 -1321 -206 -1259
+rect 206 -1321 240 -1259
+rect -240 -1355 -144 -1321
+rect 144 -1355 240 -1321
+<< properties >>
+string gencell sky130_fd_pr__nfet_03v3_nvt
+string FIXED_BBOX -223 -1338 223 1338
+string parameters w 1 l 0.6 m 6 nf 1 diffcov 100 polycov 100 guard 1 glc 1 grc 1 gtc 1 gbc 1 tbcov 100 rlcov 100 topc 1 botc 1 poverlap 0 doverlap 1 lmin 0.50 wmin 0.42 compatible {sky130_fd_pr__nfet_01v8 sky130_fd_pr__nfet_01v8_lvt sky130_fd_bs_flash__special_sonosfet_star sky130_fd_pr__nfet_g5v0d10v5 sky130_fd_pr__nfet_05v0_nvt sky130_fd_pr__nfet_03v3_nvt} full_metal 1 viasrc 100 viadrn 100 viagate 100 viagb 0 viagr 0 viagl 0 viagt 0
+string library sky130
+<< end >>
diff --git a/comparator/sky130_fd_pr__nfet_03v3_nvt_NAHJCF.mag b/comparator/sky130_fd_pr__nfet_03v3_nvt_NAHJCF.mag
new file mode 100644
index 0000000..6c8e33e
--- /dev/null
+++ b/comparator/sky130_fd_pr__nfet_03v3_nvt_NAHJCF.mag
@@ -0,0 +1,134 @@
+magic
+tech sky130A
+timestamp 1632334879
+<< pwell >>
+rect -144 -388 144 388
+<< nnmos >>
+rect -30 159 30 259
+rect -30 -50 30 50
+rect -30 -259 30 -159
+<< mvndiff >>
+rect -59 253 -30 259
+rect -59 165 -53 253
+rect -36 165 -30 253
+rect -59 159 -30 165
+rect 30 253 59 259
+rect 30 165 36 253
+rect 53 165 59 253
+rect 30 159 59 165
+rect -59 44 -30 50
+rect -59 -44 -53 44
+rect -36 -44 -30 44
+rect -59 -50 -30 -44
+rect 30 44 59 50
+rect 30 -44 36 44
+rect 53 -44 59 44
+rect 30 -50 59 -44
+rect -59 -165 -30 -159
+rect -59 -253 -53 -165
+rect -36 -253 -30 -165
+rect -59 -259 -30 -253
+rect 30 -165 59 -159
+rect 30 -253 36 -165
+rect 53 -253 59 -165
+rect 30 -259 59 -253
+<< mvndiffc >>
+rect -53 165 -36 253
+rect 36 165 53 253
+rect -53 -44 -36 44
+rect 36 -44 53 44
+rect -53 -253 -36 -165
+rect 36 -253 53 -165
+<< mvpsubdiff >>
+rect -126 364 126 370
+rect -126 347 -72 364
+rect 72 347 126 364
+rect -126 341 126 347
+rect -126 316 -97 341
+rect -126 -316 -120 316
+rect -103 -316 -97 316
+rect 97 316 126 341
+rect -126 -341 -97 -316
+rect 97 -316 103 316
+rect 120 -316 126 316
+rect 97 -341 126 -316
+rect -126 -347 126 -341
+rect -126 -364 -72 -347
+rect 72 -364 126 -347
+rect -126 -370 126 -364
+<< mvpsubdiffcont >>
+rect -72 347 72 364
+rect -120 -316 -103 316
+rect 103 -316 120 316
+rect -72 -364 72 -347
+<< poly >>
+rect -30 295 30 303
+rect -30 278 -22 295
+rect 22 278 30 295
+rect -30 259 30 278
+rect -30 140 30 159
+rect -30 123 -22 140
+rect 22 123 30 140
+rect -30 115 30 123
+rect -30 86 30 94
+rect -30 69 -22 86
+rect 22 69 30 86
+rect -30 50 30 69
+rect -30 -69 30 -50
+rect -30 -86 -22 -69
+rect 22 -86 30 -69
+rect -30 -94 30 -86
+rect -30 -123 30 -115
+rect -30 -140 -22 -123
+rect 22 -140 30 -123
+rect -30 -159 30 -140
+rect -30 -278 30 -259
+rect -30 -295 -22 -278
+rect 22 -295 30 -278
+rect -30 -303 30 -295
+<< polycont >>
+rect -22 278 22 295
+rect -22 123 22 140
+rect -22 69 22 86
+rect -22 -86 22 -69
+rect -22 -140 22 -123
+rect -22 -295 22 -278
+<< locali >>
+rect -120 347 -72 364
+rect 72 347 120 364
+rect -120 316 -103 347
+rect 103 316 120 347
+rect -30 278 -22 295
+rect 22 278 30 295
+rect -53 253 -36 261
+rect -53 157 -36 165
+rect 36 253 53 261
+rect 36 157 53 165
+rect -30 123 -22 140
+rect 22 123 30 140
+rect -30 69 -22 86
+rect 22 69 30 86
+rect -53 44 -36 52
+rect -53 -52 -36 -44
+rect 36 44 53 52
+rect 36 -52 53 -44
+rect -30 -86 -22 -69
+rect 22 -86 30 -69
+rect -30 -140 -22 -123
+rect 22 -140 30 -123
+rect -53 -165 -36 -157
+rect -53 -261 -36 -253
+rect 36 -165 53 -157
+rect 36 -261 53 -253
+rect -30 -295 -22 -278
+rect 22 -295 30 -278
+rect -120 -347 -103 -316
+rect 103 -347 120 -316
+rect -120 -364 -72 -347
+rect 72 -364 120 -347
+<< properties >>
+string gencell sky130_fd_pr__nfet_03v3_nvt
+string FIXED_BBOX -111 -355 111 355
+string parameters w 1 l 0.6 m 3 nf 1 diffcov 100 polycov 100 guard 1 glc 1 grc 1 gtc 1 gbc 1 tbcov 100 rlcov 100 topc 1 botc 1 poverlap 0 doverlap 1 lmin 0.50 wmin 0.42 compatible {sky130_fd_pr__nfet_01v8 sky130_fd_pr__nfet_01v8_lvt sky130_fd_bs_flash__special_sonosfet_star sky130_fd_pr__nfet_g5v0d10v5 sky130_fd_pr__nfet_05v0_nvt sky130_fd_pr__nfet_03v3_nvt} full_metal 1 viasrc 100 viadrn 100 viagate 100 viagb 0 viagr 0 viagl 0 viagt 0
+string library sky130
+<< end >>
diff --git a/comparator/sky130_fd_pr__nfet_03v3_nvt_ZJHJCF.mag b/comparator/sky130_fd_pr__nfet_03v3_nvt_ZJHJCF.mag
index 50f5f02..f5c8493 100644
--- a/comparator/sky130_fd_pr__nfet_03v3_nvt_ZJHJCF.mag
+++ b/comparator/sky130_fd_pr__nfet_03v3_nvt_ZJHJCF.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1632244518
+timestamp 1632332784
<< pwell >>
rect -288 -985 288 985
<< nnmos >>
diff --git a/comparator/sky130_fd_pr__pfet_g5v0d10v5_CABTE7.mag b/comparator/sky130_fd_pr__pfet_g5v0d10v5_CABTE7.mag
index 815a952..b03b3eb 100644
--- a/comparator/sky130_fd_pr__pfet_g5v0d10v5_CABTE7.mag
+++ b/comparator/sky130_fd_pr__pfet_g5v0d10v5_CABTE7.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1632243750
+timestamp 1632332974
<< nwell >>
rect -308 -1251 308 1251
<< mvpmos >>
