Update breakpoint and remove align duplication