Better Tiebreaker Logic