These lines will go away when I start using helper methods from canvas_utils (line 419-420)