overhaul of breakpoints