more changes to allow for a debugger