diff --git a/comparator/comparator.mag b/comparator/comparator.mag
index a0041e4..19c5cdc 100644
--- a/comparator/comparator.mag
+++ b/comparator/comparator.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1632490576
+timestamp 1632652117
 << locali >>
 rect 1760 1900 1860 1920
 rect 1760 1840 1780 1900
@@ -46,26 +46,35 @@
 rect 460 760 2000 860
 rect 3800 720 3900 840
 rect 2880 620 3900 720
-use diffamp  diffamp_0
-timestamp 1632488633
-transform 1 0 4840 0 1 -1080
-box -940 980 620 3400
-use decision  decision_0
-timestamp 1632485541
-transform 1 0 2020 0 1 145
-box -120 -245 1711 2620
 use preamp  preamp_0
 timestamp 1632332974
 transform 1 0 -145 0 1 115
 box -255 -115 1909 2460
+use decision  decision_0
+timestamp 1632485541
+transform 1 0 2020 0 1 145
+box -120 -245 1711 2620
+use diffamp  diffamp_0
+timestamp 1632488633
+transform 1 0 4840 0 1 -1080
+box -940 980 620 3400
 << labels >>
 rlabel metal1 -440 1270 -430 1350 1 VP
+port 2 n
 rlabel metal1 -440 1160 -430 1240 1 VN
+port 1 n
 rlabel metal1 480 2760 1620 2800 1 VGND
+port 5 n
 rlabel metal1 2720 2760 4420 2800 1 VGND
+port 5 n
 rlabel metal1 -440 1820 -420 1920 1 BIASN
+port 3 n
 rlabel metal1 4560 2760 4660 2800 1 VOUT
+port 6 n
 rlabel metal1 4940 2760 5360 2800 1 VDD1v8
+port 7 n
 rlabel metal1 2060 2760 2400 2800 1 VDD3v3
+port 4 n
 rlabel metal1 -240 2760 40 2800 1 VDD3v3
+port 4 n
 << end >>
diff --git a/comparator/comparator.spice b/comparator/comparator.spice
index 984bf35..30381d3 100644
--- a/comparator/comparator.spice
+++ b/comparator/comparator.spice
@@ -1,5 +1,6 @@
 * SPICE3 file created from comparator.ext - technology: sky130A
 
+.subckt comparator VN VP BIASN VDD3v3 VGND VOUT VDD1v8
 X0 VGND VGND VGND VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=180000u
 X1 diffamp_0/VOPAMP diffamp_0/VOP diffamp_0/ISINK VGND sky130_fd_pr__nfet_01v8 ad=-0p pd=0u as=-0p ps=0u w=1e+06u l=180000u
 X2 VGND VGND VGND VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=180000u
@@ -49,5 +50,7 @@
 C0 decision_0/ISINK VGND 2.29fF
 C1 diffamp_0/VON VGND 3.61fF
 C2 VDD3v3 VGND 13.15fF
-C3 VDD1v8 VGND 12.14fF
-C4 diffamp_0/VONAMP VGND 2.51fF
+C3 BIASN VGND 2.48fF
+C4 VDD1v8 VGND 11.05fF
+C5 diffamp_0/VONAMP VGND 2.51fF
+.ends