diff --git a/0023-on.keychord_press b/0023-on.keychord_press
index 8af439b..dbb1a68 100644
--- a/0023-on.keychord_press
+++ b/0023-on.keychord_press
@@ -71,12 +71,6 @@ on.keychord_press = function(chord, key)
 					Viewport_bounds.xmax - App.screen.width/Viewport.zoom),
 				Viewport.x + App.screen.width/Viewport.zoom)
 			B()
-		elseif chord == 'M-1' then
-			if Debug_draw_fn ~= draw_debug_ui1 then
-				Debug_draw_fn = draw_debug_ui1
-			else
-				Debug_draw_fn = nil
-			end
 		end
 	end
 end
diff --git a/0026-on.draw b/0026-on.draw
index b73dcb5..f4750a6 100644
--- a/0026-on.draw
+++ b/0026-on.draw
@@ -21,6 +21,7 @@ on.draw = function()
 			end
 		end
 	end
+	if Show_debug then draw_debug() end
 	if Global_state.thread then
 		draw_menu_bar()
 	end
diff --git a/0113-draw_debug_ui1 b/0113-draw_debug_ui1
deleted file mode 100644
index 21b043d..0000000
--- a/0113-draw_debug_ui1
+++ /dev/null
@@ -1,8 +0,0 @@
-draw_debug_ui1 = function()
-	local x, y =  App.screen.width/3, App.screen.height/3
-	local w, h = App.screen.width/3, App.screen.height/3
-	App.color{r=1, g=1, b=1}
-	love.graphics.rectangle('fill', x,y, w, h)
-	App.color{r=0, g=0, b=0}
-	love.graphics.rectangle('line', x+10, y+10, w-20, h-20, 5,5)
-end
\ No newline at end of file
diff --git a/0114-Debug_draw_fn b/0114-Debug_draw_fn
deleted file mode 100644
index d484f03..0000000
--- a/0114-Debug_draw_fn
+++ /dev/null
@@ -1 +0,0 @@
-Debug_draw_fn = nil
\ No newline at end of file
diff --git a/0121-draw_debug b/0121-draw_debug
new file mode 100644
index 0000000..324cee4
--- /dev/null
+++ b/0121-draw_debug
@@ -0,0 +1,2 @@
+draw_debug = function()
+end
diff --git a/0122-Show_debug b/0122-Show_debug
new file mode 100644
index 0000000..78d0d57
--- /dev/null
+++ b/0122-Show_debug
@@ -0,0 +1 @@
+Show_debug = false
\ No newline at end of file