Switched to names in rankings and added cup