Updated debugger