Special  diff output + debugger changes