Better breakout logic