Redone for new match page.