diff --git a/fuzzers/007-timing/Makefile b/fuzzers/007-timing/Makefile
index 52202107..9d0225c8 100644
--- a/fuzzers/007-timing/Makefile
+++ b/fuzzers/007-timing/Makefile
@@ -1,10 +1,31 @@
+SLICEL_SDFS = bel/build/CLBLL_L.sdf bel/build/CLBLL_R.sdf bel/build/CLBLM_L.sdf bel/build/CLBLM_R.sdf routing-bels/build/slicel.sdf
+SLICEM_SDFS = bel/build/CLBLL_L.sdf bel/build/CLBLL_R.sdf bel/build/CLBLM_L.sdf bel/build/CLBLM_R.sdf routing-bels/build/slicem.sdf
+
 run: all
-all: bel/build/sdf
+all: pushdb
 	touch run.ok
 
 clean:
 	cd bel && $(MAKE) clean
+	cd routing-bels && $(MAKE) clean
 
-bel/build/sdf:
+bel/build/sdf.ok:
 	cd bel && $(MAKE)
 
+routing-bels/build/sdf:
+	cd routing-bels && $(MAKE)
+
+mergesdfs: bel/build/sdf.ok routing-bels/build/sdf
+	mkdir -p sdfs
+	python3 ${XRAY_UTILS_DIR}/sdfmerge.py --sdfs $(SLICEM_SDFS) --site SLICEM --out sdfs/slicem.sdf
+	python3 ${XRAY_UTILS_DIR}/sdfmerge.py --sdfs $(SLICEL_SDFS) --site SLICEL --out sdfs/slicel.sdf --json debu.json
+	cp bel/build/*.sdf sdfs
+
+pushdb: mergesdfs
+	mkdir -p ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/timings
+	cp sdfs/*.sdf ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/timings
+	touch run.ok
+
+cleandb:
+	rm -rf ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/timings
+
diff --git a/fuzzers/007-timing/bel/Makefile b/fuzzers/007-timing/bel/Makefile
index eda5433d..2b248e33 100644
--- a/fuzzers/007-timing/bel/Makefile
+++ b/fuzzers/007-timing/bel/Makefile
@@ -1,4 +1,4 @@
-all: pushdb
+all: build/sdf
 
 clean:
 	rm -rf build
@@ -19,15 +19,5 @@ build/bel_timings.json: build/fixup_timings
 
 build/sdf: build/bel_timings.json
 	python3 ${XRAY_UTILS_DIR}/makesdf.py --json=${PWD}/build/bel_timings.json --sdf=${PWD}/build
+	touch build/sdf.ok
 
-cleandb:
-	rm -rf ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/timings
-
-mergesdfs: build/sdf
-	python3 ${XRAY_UTILS_DIR}/sdfmerge.py --sdfs build/CLBLL_L.sdf build/CLBLL_R.sdf build/CLBLM_L.sdf build/CLBLM_R.sdf --site SLICEM --out build/slicem.sdf
-	python3 ${XRAY_UTILS_DIR}/sdfmerge.py --sdfs build/CLBLL_L.sdf build/CLBLL_R.sdf build/CLBLM_L.sdf build/CLBLM_R.sdf --site SLICEL --out build/slicel.sdf
-
-pushdb: mergesdfs
-	mkdir -p ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/timings
-	cp build/*sdf ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/timings
-	touch run.ok
diff --git a/fuzzers/007-timing/routing-bels/Makefile b/fuzzers/007-timing/routing-bels/Makefile
index 784fa3fe..0ed66695 100644
--- a/fuzzers/007-timing/routing-bels/Makefile
+++ b/fuzzers/007-timing/routing-bels/Makefile
@@ -4,10 +4,10 @@ clean:
 	rm -rf build
 
 build/slicel.sdf: build/slicel.txt
-	python3 tim2sdf.py --timings build/slicel.txt --site slicel --sdf build/slicel.sdf
+	python3 tim2sdf.py --timings build/slicel.txt --site SLICEL --sdf build/slicel.sdf
 
 build/slicem.sdf: build/slicem.txt
-	python3 tim2sdf.py --timings build/slicem.txt --site slicem --sdf build/slicem.sdf
+	python3 tim2sdf.py --timings build/slicem.txt --site SLICEM --sdf build/slicem.sdf
 
 build/slicel.txt build/slicem.txt:
 	bash runme.sh