Swimming and diving in top-20 for academics