Breakpoints shifting and removing improvement