Added additional breakpoints