more breakpoint tweaking