Novak Djokovic has been busy prepping for his return to the tour.

Two weeks ago he added the recently-retired Radek Stepanek to his camp as a full-time coach. Stepanek joined a team that already included Andre Agassi, who is expected to be on hand for the Grand Slams.

Now it looks like Djokovic is adding another member to his team as he sets his sights on a seventh Australian Open title.

Noted tennis analyst Craig O’Shannessy has confirmed he’s been spending time with the Djokovic camp and will remain by the Serb’s side throughout the Australian Open. O’Shannessy is well known in tennis circles for his early adoption of data and tech in breaking down match-level patterns. He notably helped Dustin Brown to a huge upset win over Rafael Nadal at Wimbledon 2015.

Recently, he’s been logging time in Monte Carlo—where a certain Serbian tennis player is known to train and call home.

O’Shannessy has now made the news official, calling the experience of working with Djokovic, Agassi, and Stepanek “certainly one of the highlights of my coaching career.”

Djokovic is set to make his return at the Mubadala World Tennis Championships exhibition, which begins December 28, and his ATP return will be in Doha right after.