diff --git a/demos/second/Makefile b/demos/second/Makefile
index 44e2f726..d72bfe6a 100644
--- a/demos/second/Makefile
+++ b/demos/second/Makefile
@@ -68,6 +68,7 @@ qload.o:	qload.s \
 	wait.s wait_a_bit.s \
 	lc_detect.s gr_fast_clear.s \
 	text_print.s \
+	hgr_table.s \
 	pt3_lib_detect_model.s pt3_lib_mockingboard_detect.s \
 	pt3_lib_mockingboard_setup.s interrupt_handler.s \
 	pt3_lib_mockingboard_patch.s
@@ -85,6 +86,7 @@ qload2.o:	qload2.s \
 	lc_detect.s gr_fast_clear.s \
 	text_print.s start2.s \
 	hardware_detect.s \
+	hgr_table.s \
 	pt3_lib_detect_model.s pt3_lib_mockingboard_detect.s \
 	pt3_lib_mockingboard_setup.s interrupt_handler.s \
 	pt3_lib_mockingboard_patch.s
@@ -154,6 +156,7 @@ qload2.inc:	generate_common QLOAD2
 	./generate_common -a 0x1200 -s clear_bottom qload2.lst >> qload2.inc
 	./generate_common -a 0x1200 -s clear_bottoms qload2.lst >> qload2.inc
 	./generate_common -a 0x1200 -s clear_screens qload2.lst >> qload2.inc
+	./generate_common -a 0x1200 -s hgr_make_tables qload2.lst >> qload2.inc
 
 ####
 
diff --git a/demos/second/part19_nuts/nuts.s b/demos/second/part19_nuts/nuts.s
index d416fef7..e4c2bb24 100644
--- a/demos/second/part19_nuts/nuts.s
+++ b/demos/second/part19_nuts/nuts.s
@@ -7,7 +7,7 @@
 
 .include "../zp.inc"
 .include "../hardware.inc"
-.include "../qload.inc"
+.include "../qload2.inc"
 
 mod7_table	= $1c00
 div7_table	= $1d00
@@ -32,7 +32,7 @@ load_loop:
 	lda	#0
 	jsr	hgr_page1_clearscreen
 
-	jsr	hgr_make_tables
+;	jsr	hgr_make_tables
 
 
 	; fc logo
@@ -63,7 +63,7 @@ nuts_done:
 .align $100
 	.include	"../wait_keypress.s"
 	.include	"../zx02_optim.s"
-	.include	"../hgr_table.s"
+;	.include	"../hgr_table.s"
 	.include	"../hgr_clear_screen.s"
 
 
diff --git a/demos/second/part20_credits/credits.s b/demos/second/part20_credits/credits.s
index 63d25737..7c8db15b 100644
--- a/demos/second/part20_credits/credits.s
+++ b/demos/second/part20_credits/credits.s
@@ -8,7 +8,7 @@
 
 .include "../zp.inc"
 .include "../hardware.inc"
-.include "../qload.inc"
+.include "../qload2.inc"
 
 mod7_table	= $1c00
 div7_table	= $1d00
@@ -33,7 +33,7 @@ load_loop:
 	lda	#0
 	jsr	hgr_page1_clearscreen
 
-	jsr	hgr_make_tables
+;	jsr	hgr_make_tables
 
 	;=====================
 	;=====================
@@ -127,7 +127,7 @@ no_update_message:
 .align $100
 	.include	"../wait_keypress.s"
 	.include	"../zx02_optim.s"
-	.include	"../hgr_table.s"
+;	.include	"../hgr_table.s"
 	.include	"../hgr_clear_screen.s"
 	.include	"vertical_scroll.s"
 
diff --git a/demos/second/qload2.s b/demos/second/qload2.s
index 17ad0ae4..796ffc78 100644
--- a/demos/second/qload2.s
+++ b/demos/second/qload2.s
@@ -190,6 +190,13 @@ aux_address_array:
 	.include	"pt3_lib_detect_model.s"
 	.include	"pt3_lib_mockingboard_detect.s"
 
+mod7_table      = $1c00
+div7_table      = $1d00
+hposn_low       = $1e00
+hposn_high      = $1f00
+
+	.include	"hgr_table.s"
+
 qload_end:
 
 .assert (>qload_end - >qload_start) < $e , error, "loader too big"
diff --git a/demos/second/start2.s b/demos/second/start2.s
index cff59ee3..474e34a0 100644
--- a/demos/second/start2.s
+++ b/demos/second/start2.s
@@ -15,6 +15,8 @@ second_start:
 
 	jsr	hardware_detect
 
+	jsr	hgr_make_tables
+
 	;===================
 	; restart?
 	;===================