Removed debugger and updated source