Updates to make this breakpoint cleaner