Yes I think it was Castle! He makes some comments about the butterfly when Nadal is trying to clear it off the court and also some comments about the level of play and he's obviously just tickled by the whole scene. His enthusiasm is really charming, and relatable. What a match.