Spain's Rafael Nadal is aiming to represent his country both in this year's revamped Davis Cup in Madrid and the Tokyo Games.
Speaking at a sponsor event for Banco Sabadell, Nadal cautioned that his schedule depended on his health and fitness, but that he wanted to play.
"My intention is to be there," said the 2008 Beijing gold medalist and four-time champion in Davis Cup. "I know Tokyo is going to be spectacular, so I will do my best to be there."
Similarly, Nadal plans to play the first Davis Cup multi-nation finals in Madrid, saying his ''intention is to be there but there are a lot of months left." He also commented on the changes to the competition, saying that he liked the "old Davis Cup," but "it cannot be denied it was not adapted to these new times."
The 32-year-old also talked about his defeat to Novak Djokovic in the final of the Australian Open.
"What happened is that I played a player who was better than me at that moment so you have to just shake hands and say congratulations and keep working," said Nadal. "I had the feeling I could not play my tennis, but you have to recognize the opponent's superiority."
It was quite different from their 5 hour, 53 minute final in 2012, but Nadal, playing his first official event since retiring with injury at the US Open, said he is still coming back following his recent injuries.
"I did not have the physicality but if I'm healthy, if I can compete, I can keep playing at a good level," he said. "The truth is that I was not in shape to play six hours, but I think I can be in a few months."
Nadal is next scheduled to play at Acapulco.