diff --git a/BIOS-bochs-latest b/BIOS-bochs-latest
new file mode 100644
index 0000000..2d3fea3
Binary files /dev/null and b/BIOS-bochs-latest differ
diff --git a/Makefile b/Makefile
index 0e5d553..833a350 100644
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,19 @@
 all: main/system.iso
 
 %/system.elf: %/system.o startup.o
-	gcc -Wl,-T linker.ld $^ -m32 -static -nostdlib  -Wl,--build-id=none -o $@
 
 %/system.o: %.c 
-	mkdir -p $(shell dirname $@)
-	gcc $< -o $@ -O2 -std=c11 -m32 -c -ffunction-sections
 
 startup.o: startup.s
 	gcc startup.s -m32  -c -o startup.o -ffunction-sections
 
 %/system.iso: %/system.elf
-	rm -rf $(shell dirname $<)/grub
-	mkdir -p $(shell dirname $<)/grub/boot/grub
-	cp grub.cfg $(shell dirname $<)/grub/boot/grub
-	cp $< $(shell dirname $<)/grub/boot/system.elf
-	grub-mkrescue -o $@ $(shell dirname $<)/grub
 
 
 trace-%: %/system.elf %/system.iso
 	python bochs-experiment-runner.py -e $< -i $(shell dirname $<)/system.iso -1 \
 		-f /proj/i4ciao/tools/fail/fail-x86-tracing -- \
+		-V vgabios.bin - b BIOS-bochs-latest \
 		-Wf,--start-symbol=os_main \
 		-Wf,--save-symbol=os_main \
 		-Wf,--end-symbol=stop_trace \
@@ -31,7 +24,7 @@ import-%: %/trace.pb
 	import-trace -t $<  -i mem  -e $(shell dirname $<)/system.elf -v $(shell dirname $<) -b mem
 	import-trace -t $<  -i regs  -e $(shell dirname $<)/system.elf -v $(shell dirname $<) -b regs --flags
 	import-trace -t $<  -i regs  -e $(shell dirname $<)/system.elf -v $(shell dirname $<) -b ip --no-gp --ip
-	import-trace -v $(shell dirname $<) -b %%
+	prune-trace -v $(shell dirname $<) -b %%
 
 
 # Do never remove implicitly generated stuff
diff --git a/vgabios.bin b/vgabios.bin
new file mode 100644
index 0000000..fa9806b
Binary files /dev/null and b/vgabios.bin differ