Novak Djokovic celebrated his 38th birthday with a revenge victory over Matteo Arnaldi to reach the Geneva Open semi-finals.
Djokovic lost to the Italian in April in what was a third straight loss for the Serb great during a mixed clay-court season.
However, Djokovic came through a stern test in damp conditions to beat Arnaldi 6-4 6-4 and continue his French Open preparations in positive fashion.
He will face a semi-final against Cameron Norrie, who staged an impressive fightback to beat Australian Alexei Popyrin 7-6 (8-6) 6-4.
The Briton is into his first semi-final of the season and while facing Djokovic is a daunting prospect, he will take heart from his performance.