layout matches top-level schematic
diff --git a/gds/user_analog_project_wrapper.gds b/gds/user_analog_project_wrapper.gds
index 9dbdb15..273398b 100644
--- a/gds/user_analog_project_wrapper.gds
+++ b/gds/user_analog_project_wrapper.gds
Binary files differ
diff --git a/xschem/user_analog_project_wrapper.sch b/xschem/user_analog_project_wrapper.sch
index e0da610..1c86fb9 100644
--- a/xschem/user_analog_project_wrapper.sch
+++ b/xschem/user_analog_project_wrapper.sch
@@ -1,29 +1,25 @@
-v {xschem version=2.9.9 file_version=1.2 }
+v {xschem version=3.0.0 file_version=1.2 }
G {}
K {}
V {}
S {}
E {}
-N 3830 -460 3830 -390 { lab=vdda1}
-N 3730 -460 3830 -460 { lab=vdda1}
-N 3860 -230 3860 -180 { lab=vssa1}
-N 3770 -180 3860 -180 { lab=vssa1}
-N 3890 -460 3890 -390 { lab=vccd1}
-N 3890 -460 3960 -460 { lab=vccd1}
-N 3890 -130 3890 -60 { lab=vccd1}
-N 3890 -130 3950 -130 { lab=vccd1}
-N 3830 -130 3830 -60 { lab=io_analog[4]}
-N 3790 -130 3830 -130 { lab=io_analog[4]}
-N 3860 100 3860 150 { lab=vssa1}
-N 3800 150 3860 150 { lab=vssa1}
-N 4010 -10 4110 -10 { lab=gpio_analog[7]}
-N 4010 20 4110 20 { lab=io_out[15]}
-N 4010 50 4110 50 { lab=io_out[16]}
-N 4010 -340 4130 -340 { lab=gpio_analog[3]}
-N 4010 -310 4130 -310 { lab=io_out[11]}
-N 4010 -280 4130 -280 { lab=io_out[12]}
-C {example_por.sym} 3860 -310 0 0 {name=x1}
-C {example_por.sym} 3860 20 0 0 {name=x2}
+N 3850 -450 3850 -380 { lab=vdda1}
+N 3750 -450 3850 -450 { lab=vdda1}
+N 3850 -200 3850 -150 { lab=vssa1}
+N 3760 -150 3850 -150 { lab=vssa1}
+N 3710 -240 3750 -240 { lab=io_analog[4]}
+N 4080 -260 4180 -260 { lab=io_out[17]}
+N 3980 -200 3980 -100 { lab=io_in[18]}
+N 3890 -200 3890 -80 { lab=vssd2}
+N 3760 -80 3890 -80 { lab=vssd2}
+N 3750 -500 3890 -500 { lab=vccd2}
+N 3890 -500 3890 -380 { lab=vccd2}
+N 3710 -340 3750 -340 { lab=io_analog[5]}
+N 4010 -200 4010 -100 { lab=io_in[19]}
+N 4030 -200 4030 -100 { lab=io_in[23]}
+N 3980 -480 3980 -380 { lab=io_in[18]}
+N 4080 -290 4180 -290 { lab=la_data_out[29:36]}
C {devices/iopin.sym} 3240 -470 0 0 {name=p1 lab=vdda1}
C {devices/iopin.sym} 3240 -440 0 0 {name=p2 lab=vdda2}
C {devices/iopin.sym} 3240 -410 0 0 {name=p3 lab=vssa1}
@@ -56,15 +52,26 @@
C {devices/iopin.sym} 3250 530 0 0 {name=p31 lab=io_clamp_low[2:0]}
C {devices/opin.sym} 3270 600 0 0 {name=p32 lab=user_irq[2:0]}
C {devices/ipin.sym} 3290 210 0 0 {name=p28 lab=la_oenb[127:0]}
-C {devices/lab_pin.sym} 3730 -460 0 0 {name=l1 sig_type=std_logic lab=vdda1}
-C {devices/lab_pin.sym} 3770 -180 0 0 {name=l2 sig_type=std_logic lab=vssa1}
-C {devices/lab_pin.sym} 3960 -460 0 1 {name=l3 sig_type=std_logic lab=vccd1}
-C {devices/lab_pin.sym} 3950 -130 0 1 {name=l4 sig_type=std_logic lab=vccd1}
-C {devices/lab_pin.sym} 3790 -130 0 0 {name=l5 sig_type=std_logic lab=io_analog[4]}
-C {devices/lab_pin.sym} 3800 150 0 0 {name=l6 sig_type=std_logic lab=vssa1}
-C {devices/lab_pin.sym} 4130 -340 0 1 {name=l7 sig_type=std_logic lab=gpio_analog[3]}
-C {devices/lab_pin.sym} 4130 -310 0 1 {name=l8 sig_type=std_logic lab=io_out[11]}
-C {devices/lab_pin.sym} 4130 -280 0 1 {name=l9 sig_type=std_logic lab=io_out[12]}
-C {devices/lab_pin.sym} 4110 -10 0 1 {name=l10 sig_type=std_logic lab=gpio_analog[7]}
-C {devices/lab_pin.sym} 4110 20 0 1 {name=l11 sig_type=std_logic lab=io_out[15]}
-C {devices/lab_pin.sym} 4110 50 0 1 {name=l12 sig_type=std_logic lab=io_out[16]}
+C {devices/lab_pin.sym} 3750 -450 0 0 {name=l1 sig_type=std_logic lab=vdda1}
+C {devices/lab_pin.sym} 3760 -150 0 0 {name=l2 sig_type=std_logic lab=vssa1}
+C {devices/lab_pin.sym} 3750 -500 0 0 {name=l3 sig_type=std_logic lab=vccd2
+}
+C {devices/lab_pin.sym} 3710 -240 0 0 {name=l5 sig_type=std_logic lab=io_analog[4]}
+C {devices/lab_pin.sym} 3760 -80 0 0 {name=l6 sig_type=std_logic lab=vssd2
+}
+C {devices/lab_pin.sym} 4180 -290 0 1 {name=l7 sig_type=std_logic lab=la_data_out[29:36]
+}
+C {devices/lab_pin.sym} 4180 -260 0 1 {name=l11 sig_type=std_logic lab=io_out[17]
+}
+C {devices/lab_pin.sym} 3980 -100 1 1 {name=l12 sig_type=std_logic lab=io_in[18]
+}
+C {/home/christoph/Studium/projekte/design/mpw3-tapeout/caravel_user_project_analog/xschem/sar/sar/sar.sym} 4030 -110 0 0 {name=xsar
+}
+C {devices/lab_pin.sym} 3710 -340 0 0 {name=l4 sig_type=std_logic lab=io_analog[5]
+}
+C {devices/lab_pin.sym} 4010 -100 1 1 {name=l13 sig_type=std_logic lab=io_in[19]
+}
+C {devices/lab_pin.sym} 4030 -100 1 1 {name=l14 sig_type=std_logic lab=io_in[23]
+}
+C {devices/lab_pin.sym} 3980 -480 3 1 {name=l15 sig_type=std_logic lab=io_in[18]
+}
