Updated more tiebreaker rules