Improve debugger-2