tweaks, added breakpoint