diff --git a/gds/caravel.gds.gz b/gds/caravel.gds.gz
index cb1524e..983b13b 100644
--- a/gds/caravel.gds.gz
+++ b/gds/caravel.gds.gz
Binary files differ
diff --git a/gds/caravel.mag b/gds/caravel.mag
index b9c9c4b..53b2ab2 100644
--- a/gds/caravel.mag
+++ b/gds/caravel.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1607987374
+timestamp 1607989574
 << checkpaint >>
 rect -1260 -1260 718860 1038860
 << metal1 >>
@@ -81614,187 +81614,187 @@
 rect 400342 222659 400384 222895
 rect 380288 222617 400384 222659
 use user_id_programming  user_id_value ../mag
-timestamp 1607987374
+timestamp 1607989574
 transform 1 0 656625 0 1 80926
 box 0 0 7109 7077
 use storage  storage ../mag
-timestamp 1607987374
+timestamp 1607989574
 transform 1 0 52031 0 1 61392
 box 0 0 88934 189234
 use mgmt_core  soc ../mag
-timestamp 1607987374
+timestamp 1607989574
 transform 1 0 204550 0 1 53700
 box 0 0 430000 170000
 use sky130_fd_sc_hvl__lsbufhv2lv_1_wrapped  rstb_level ../mag
-timestamp 1607987374
+timestamp 1607989574
 transform 1 0 154753 0 1 51403
 box 0 1 5124 5084
 use simple_por  por ../mag
-timestamp 1607987374
+timestamp 1607989574
 transform 1 0 654176 0 1 104197
 box 25 11 11344 8338
 use mgmt_protect  mgmt_buffers ../mag
-timestamp 1607987374
+timestamp 1607989574
 transform 1 0 288100 0 1 239747
 box 0 0 169594 13025
 use gpio_control_block  gpio_control_bidir\[1\] ../mag
-timestamp 1607987374
+timestamp 1607989574
 transform -1 0 708537 0 1 166200
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_bidir\[0\]
-timestamp 1607987374
+timestamp 1607989574
 transform -1 0 708537 0 1 121000
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[37\]
-timestamp 1607987374
+timestamp 1607989574
 transform 1 0 8567 0 1 202600
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[36\]
-timestamp 1607987374
+timestamp 1607989574
 transform 1 0 8567 0 1 245800
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[3\]
-timestamp 1607987374
+timestamp 1607989574
 transform -1 0 708537 0 1 256400
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[2\]
-timestamp 1607987374
+timestamp 1607989574
 transform -1 0 708537 0 1 211200
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[35\]
-timestamp 1607987374
+timestamp 1607989574
 transform 1 0 8567 0 1 289000
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[34\]
-timestamp 1607987374
+timestamp 1607989574
 transform 1 0 8567 0 1 332200
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[33\]
-timestamp 1607987374
+timestamp 1607989574
 transform 1 0 8567 0 1 375400
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[5\]
-timestamp 1607987374
+timestamp 1607989574
 transform -1 0 708537 0 1 346400
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[4\]
-timestamp 1607987374
+timestamp 1607989574
 transform -1 0 708537 0 1 301400
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[7\]
-timestamp 1607987374
+timestamp 1607989574
 transform -1 0 708537 0 1 479800
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[6\]
-timestamp 1607987374
+timestamp 1607989574
 transform -1 0 708537 0 1 391600
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[32\]
-timestamp 1607987374
+timestamp 1607989574
 transform 1 0 8567 0 1 418600
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[31\]
-timestamp 1607987374
+timestamp 1607989574
 transform 1 0 8567 0 1 546200
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[30\]
-timestamp 1607987374
+timestamp 1607989574
 transform 1 0 8567 0 1 589400
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[29\]
-timestamp 1607987374
+timestamp 1607989574
 transform 1 0 8567 0 1 632600
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[9\]
-timestamp 1607987374
+timestamp 1607989574
 transform -1 0 708537 0 1 568800
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[8\]
-timestamp 1607987374
+timestamp 1607989574
 transform -1 0 708537 0 1 523800
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[10\]
-timestamp 1607987374
+timestamp 1607989574
 transform -1 0 708537 0 1 614000
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[28\]
-timestamp 1607987374
+timestamp 1607989574
 transform 1 0 8567 0 1 675800
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[27\]
-timestamp 1607987374
+timestamp 1607989574
 transform 1 0 8567 0 1 719000
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[26\]
-timestamp 1607987374
+timestamp 1607989574
 transform 1 0 8567 0 1 762200
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[13\]
-timestamp 1607987374
+timestamp 1607989574
 transform -1 0 708537 0 1 749200
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[12\]
-timestamp 1607987374
+timestamp 1607989574
 transform -1 0 708537 0 1 704200
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[11\]
-timestamp 1607987374
+timestamp 1607989574
 transform -1 0 708537 0 1 659000
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[25\]
-timestamp 1607987374
+timestamp 1607989574
 transform 1 0 8567 0 1 805400
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[24\]
-timestamp 1607987374
+timestamp 1607989574
 transform 1 0 8567 0 1 889800
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[23\]
-timestamp 1607987374
+timestamp 1607989574
 transform 0 1 97200 -1 0 1029747
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[22\]
-timestamp 1607987374
+timestamp 1607989574
 transform 0 1 148600 -1 0 1029747
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[21\]
-timestamp 1607987374
+timestamp 1607989574
 transform 0 1 200000 -1 0 1029747
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[20\]
-timestamp 1607987374
+timestamp 1607989574
 transform 0 1 251400 -1 0 1029747
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[19\]
-timestamp 1607987374
+timestamp 1607989574
 transform 0 1 303000 -1 0 1029747
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[18\]
-timestamp 1607987374
+timestamp 1607989574
 transform 0 1 353400 -1 0 1029747
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[17\]
-timestamp 1607987374
+timestamp 1607989574
 transform 0 1 420800 -1 0 1029747
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[16\]
-timestamp 1607987374
+timestamp 1607989574
 transform 0 1 497800 -1 0 1029747
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[15\]
-timestamp 1607987374
+timestamp 1607989574
 transform 0 1 549200 -1 0 1029747
 box 0 0 33934 18344
 use gpio_control_block  gpio_control_in\[14\]
-timestamp 1607987374
+timestamp 1607989574
 transform -1 0 708537 0 1 927600
 box 0 0 33934 18344
 use chip_io  padframe ../mag
-timestamp 1607987374
+timestamp 1607989574
 transform 1 0 0 0 1 0
 box 0 0 717600 1037600
 use user_project_wrapper  mprj ../mag
-timestamp 1607987374
+timestamp 1607989574
 transform 1 0 65277 0 1 276402
 box -8436 -7366 592360 711302
 << properties >>
diff --git a/gds/caravel.old.gds.gz b/gds/caravel.old.gds.gz
index 8ff0823..cb1524e 100644
--- a/gds/caravel.old.gds.gz
+++ b/gds/caravel.old.gds.gz
Binary files differ
diff --git a/openlane/user_project_wrapper_empty/config.tcl b/openlane/user_project_wrapper_empty/config.tcl
index 66a1707..70d4caa 100644
--- a/openlane/user_project_wrapper_empty/config.tcl
+++ b/openlane/user_project_wrapper_empty/config.tcl
@@ -1,46 +1 @@
-set script_dir [file dirname [file normalize [info script]]]
-
-set ::env(DESIGN_NAME) user_project_wrapper
-set ::env(FP_PIN_ORDER_CFG) $script_dir/pin_order.cfg
-
-set ::env(PDN_CFG) $script_dir/pdn.tcl
-set ::env(FP_PDN_CORE_RING) 1
-set ::env(FP_SIZING) absolute
-set ::env(DIE_AREA) "0 0 2920 3520"
-
-set ::unit 2.4
-set ::env(FP_IO_VEXTEND) [expr 2*$::unit]
-set ::env(FP_IO_HEXTEND) [expr 2*$::unit]
-set ::env(FP_IO_VLENGTH) $::unit
-set ::env(FP_IO_HLENGTH) $::unit
-
-set ::env(FP_IO_VTHICKNESS_MULT) 4
-set ::env(FP_IO_HTHICKNESS_MULT) 4
-
-
-set ::env(CLOCK_PORT) "user_clock2"
-set ::env(CLOCK_NET) "mprj.clk"
-
-set ::env(CLOCK_PERIOD) "10"
-
-set ::env(PL_OPENPHYSYN_OPTIMIZATIONS) 0
-set ::env(DIODE_INSERTION_STRATEGY) 0
-
-# Need to fix a FastRoute bug for this to work, but it's good
-# for a sense of "isolation"
-set ::env(MAGIC_ZEROIZE_ORIGIN) 0
-set ::env(MAGIC_WRITE_FULL_LEF) 1
-
-set ::env(VERILOG_FILES) "\
-	$script_dir/../../verilog/rtl/defines.v \
-	$script_dir/../../verilog/rtl/user_project_wrapper.v"
-
-set ::env(VERILOG_FILES_BLACKBOX) "\
-	$script_dir/../../verilog/rtl/defines.v \
-	$script_dir/../../verilog/rtl/user_proj_example.v"
-
-set ::env(EXTRA_LEFS) "\
-	$script_dir/../../lef/user_proj_example.lef"
-
-set ::env(EXTRA_GDS_FILES) "\
-	$script_dir/../../gds/user_proj_example.gds"
+../user_project_wrapper_empty/config.tcl
diff --git a/openlane/user_project_wrapper_empty/pin_order.cfg b/openlane/user_project_wrapper_empty/pin_order.cfg
index 6de1406..efac285 100644
--- a/openlane/user_project_wrapper_empty/pin_order.cfg
+++ b/openlane/user_project_wrapper_empty/pin_order.cfg
@@ -1,157 +1 @@
-#BUS_SORT
-#NR
-analog_io\[15\]
-io_in\[15\]
-io_out\[15\]
-io_oeb\[15\]
-analog_io\[16\]
-io_in\[16\]
-io_out\[16\]
-io_oeb\[16\]
-analog_io\[17\]
-io_in\[17\]
-io_out\[17\]
-io_oeb\[17\]
-analog_io\[18\]
-io_in\[18\]
-io_out\[18\]
-io_oeb\[18\]
-analog_io\[19\]
-io_in\[19\]
-io_out\[19\]
-io_oeb\[19\]
-analog_io\[20\]
-io_in\[20\]
-io_out\[20\]
-io_oeb\[20\]
-analog_io\[21\]
-io_in\[21\]
-io_out\[21\]
-io_oeb\[21\]
-analog_io\[22\]
-io_in\[22\]
-io_out\[22\]
-io_oeb\[22\]
-analog_io\[23\]
-io_in\[23\]
-io_out\[23\]
-io_oeb\[23\]
-
-#S
-wb_.*
-wbs_.*
-la_.*
-user_clock2
-
-#E
-analog_io\[0\]
-io_in\[0\]
-io_out\[0\]
-io_oeb\[0\]
-analog_io\[1\]
-io_in\[1\]
-io_out\[1\]
-io_oeb\[1\]
-analog_io\[2\]
-io_in\[2\]
-io_out\[2\]
-io_oeb\[2\]
-analog_io\[3\]
-io_in\[3\]
-io_out\[3\]
-io_oeb\[3\]
-analog_io\[4\]
-io_in\[4\]
-io_out\[4\]
-io_oeb\[4\]
-analog_io\[5\]
-io_in\[5\]
-io_out\[5\]
-io_oeb\[5\]
-analog_io\[6\]
-io_in\[6\]
-io_out\[6\]
-io_oeb\[6\]
-analog_io\[7\]
-io_in\[7\]
-io_out\[7\]
-io_oeb\[7\]
-analog_io\[8\]
-io_in\[8\]
-io_out\[8\]
-io_oeb\[8\]
-analog_io\[9\]
-io_in\[9\]
-io_out\[9\]
-io_oeb\[9\]
-analog_io\[10\]
-io_in\[10\]
-io_out\[10\]
-io_oeb\[10\]
-analog_io\[11\]
-io_in\[11\]
-io_out\[11\]
-io_oeb\[11\]
-analog_io\[12\]
-io_in\[12\]
-io_out\[12\]
-io_oeb\[12\]
-analog_io\[13\]
-io_in\[13\]
-io_out\[13\]
-io_oeb\[13\]
-analog_io\[14\]
-io_in\[14\]
-io_out\[14\]
-io_oeb\[14\]
-
-#WR
-analog_io\[24\]
-io_in\[24\]
-io_out\[24\]
-io_oeb\[24\]
-analog_io\[25\]
-io_in\[25\]
-io_out\[25\]
-io_oeb\[25\]
-analog_io\[26\]
-io_in\[26\]
-io_out\[26\]
-io_oeb\[26\]
-analog_io\[27\]
-io_in\[27\]
-io_out\[27\]
-io_oeb\[27\]
-analog_io\[28\]
-io_in\[28\]
-io_out\[28\]
-io_oeb\[28\]
-analog_io\[29\]
-io_in\[29\]
-io_out\[29\]
-io_oeb\[29\]
-analog_io\[30\]
-io_in\[30\]
-io_out\[30\]
-io_oeb\[30\]
-io_in\[31\]
-io_out\[31\]
-io_oeb\[31\]
-io_in\[32\]
-io_out\[32\]
-io_oeb\[32\]
-io_in\[33\]
-io_out\[33\]
-io_oeb\[33\]
-io_in\[34\]
-io_out\[34\]
-io_oeb\[34\]
-io_in\[35\]
-io_out\[35\]
-io_oeb\[35\]
-io_in\[36\]
-io_out\[36\]
-io_oeb\[36\]
-io_in\[37\]
-io_out\[37\]
-io_oeb\[37\]
+../user_project_wrapper_empty/pin_order.cfg