Added more breakpoints