Basic breakpoints added