The seven-time Wimbledon champion Roger Federer has signed up to play at the Stuttgart grass court tournament for the next two years, meaning the Swiss superstar will not be retiring after next season.

The ATP Stuttgart Open was scheduled for post-Wimbledon this year in Germany, but it will be played before the grass court Grand Slam in 2016.

Roger Federer to play Stuttgart grass tournament through 2017 – https://t.co/wEOOfjsx73 #MercedesCup pic.twitter.com/J7fPfwXGW6

— Go Roger Federer (@GoRogerFederer) November 21, 2015

“I watched the first grass court edition on television, it had a great atmosphere. I’ve always wanted to play Stuttgart, but it was always the wrong time after Wimbledon,” said the 34-year-old.

“Now that they’ve moved dates, the chance to play the Mercedes Cup is very exciting — I can’t wait.”