Updated for tennis and ice hockey