Debugger removed and design improved