Improve debugger-1