Thereafter he probably has to work his way past Sam Querrey, Jo-Wilfried Tsonga and either Kyrgios or Marin Cilic to get to the final again - where he could play the second seed, Stan Wawrinka, who put him out of Roland Garros before losing to Rafael Nadal in the final.