Added changes for GUI debugger