diff --git a/Makefile b/Makefile
index 7cb1d80..7a1745d 100644
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,7 @@
 	@echo "###############################################"
 	@echo "Generating Caravel GDS (sources are in the 'gds' directory)"
 	@sleep 1
-	@cd mag && MAGTYPE=mag magic -rcfile ${PDK_ROOT}/sky130A/libs.tech/magic/current/sky130A.magicrc -noc -dnull mag2gds.tcl < /dev/null
-	mv mag/caravel_out.gds gds
+	@cd gds && MAGTYPE=mag magic -rcfile ${PDK_ROOT}/sky130A/libs.tech/magic/current/sky130A.magicrc -noc -dnull gen_caravel.tcl < /dev/null
 
 
 
@@ -36,7 +35,7 @@
 
 
 $(LARGE_FILES_GZ): %.gz: %
-	if ! [ $(suffix $<) == ".gz" ]; then\
+	@if ! [ $(suffix $<) == ".gz" ]; then\
 		gzip -n --best $< > /dev/null &&\
 		echo "$< -> $@";\
 	fi
diff --git a/gds/gen_caravel.tcl b/gds/gen_caravel.tcl
new file mode 100644
index 0000000..897579b
--- /dev/null
+++ b/gds/gen_caravel.tcl
@@ -0,0 +1,35 @@
+drc off
+gds readonly true
+gds rescale false
+
+gds read chip_io.gds
+
+gds read gpio_control_block.gds
+
+gds read mgmt_protect.gds
+
+gds read simple_por.gds
+
+gds read digital_pll.gds
+gds read DFFRAM.gds
+gds read mgmt_core.gds
+
+gds read storage.gds
+
+gds read user_id_programming.gds
+
+# Your project goes aboard here
+gds read user_project_wrapper.gds
+
+load ../mag/caravel.mag -dereference
+property GDS_FILE ""
+property GDS_START ""
+property GDS_END ""
+
+save caravel_out
+
+select top cell
+
+# cif *hier write disable
+
+gds write caravel_out.gds
diff --git a/mag/mag2gds.tcl b/mag/mag2gds.tcl
deleted file mode 100644
index 8fb640c..0000000
--- a/mag/mag2gds.tcl
+++ /dev/null
@@ -1,32 +0,0 @@
-drc off
-gds readonly true
-gds rescale false
-
-# Switch to GDS only (currently magic hangs if all statements are gds read?)
-load chip_io -dereference
-
-load gpio_control_block -dereference
-
-load mgmt_protect -dereference
-
-load simple_por -dereference
-
-load digital_pll -dereference
-load DFFRAM -dereference
-load mgmt_core -dereference
-
-gds read ../gds/sram_1rw1r_32_256_8_sky130_lp1.gds
-load storage -dereference
-
-load user_id_programming -dereference
-
-# Your project goes aboard here
-gds read ../gds/user_project_wrapper.gds
-
-load caravel -dereference
-
-select top cell
-
-# cif *hier write disable
-
-gds write caravel_out.gds