Additional work on GH-161 for Breaks