added in debugger code