Improve breakpoint and header