Partially eversing the removal of breakpoints

Removed a little more from the breakpoints than I had intended to
Merge branch 'unstable'