Former WWE Superstar Cody Rhodes will be making a guest appearance on the CW series Arrow when the show starts season 5 later this year.

Rhodes has a history with the show’s leading man, Stephen Amell, and the two shared a feud while Rhodes was in the WWE which led to a tag team match at SummerSlam with Amell teaming up with Neville and Rhodes teaming up with King Barrett.

The announcement, reported by TVLine.com, was made during a joint Wrestling Rivals appearance at the Heroes & Villains FanFest held Saturday at the Meadowlands Exposition Center in Secaucus, New Jersey.

Rhodes will be in the third episode of season 5. Arrow returns on Wednesday, October 5 at 8PM EST.