(CNN) As he nears the end of a remarkable career Roger Federer says he wants to play for Switzerland at the Tokyo 2020 Olympics.
The 20-time grand slam champion won silver in London in 2012 and clinched gold with Stan Wawrinka in doubles in Beijing in 2008.
"I just needed to take time to speak to my wife, my team and listen to my heart -- what did I really want to do?"
he told CNN Sport's Christina Macfarlane in Tokyo, shortly after making his announcement on court after his match with Isner.
I knew I always wanted to play at the Olympics but I didn't know if I could do everything because I'm not the youngest anymore and I have to pick my moments.