Expanded debugger (so many pushes because not at my computer and can only test using travis)