Roger Federer has announced his intention to play in this year's French Open.
The 20-time grand slam winner is currently easing himself back into action after a long lay-off following knee surgery.
Federer, 39, returned to tournament play after 14 months out in last month's Qatar Open.
He has not played competitively since but he is now targeting the Geneva Open in May, followed by the next major of the year at Roland Garros.
Federer tweeted: "Happy to let you know that I will play Geneva and Paris. Until then I will use the time to train. Can't wait to play in Switzerland again."
The French Open, which Federer won in 2009, is due to begin on May 30.