Supergirl‘s season 2 finale doesn’t air until May 22, but we’re learning about some familiar faces coming back as well as the major casting of a new character.

Return: Calista Flockhart as Cat Grant

First up, Calista Flockhart, who plays Kara’s former boss Cat Grant, will be appearing in the final two episodes of Supergirl season 2, reports TVLine. Details about her appearance are remaining under wraps for now, but this will be the first time we’ve seen her since she took a leave of absence from her company and left James Olsen in charge.

The real-life reason for Flockhart’s absence was the show’s move to Vancouver for filming. Flockhart, who is based in Los Angeles, was unwilling to move with the show. Thus, she was reduced from a series regular to a guest star.

Back in October, EP Andrew Kreisberg said of Flockhart, “We’re still trying to work out her schedule” and that they hoped to bring Flockhart back for “as many [episodes] as we can get.”

It will be interesting to see in what capacity Cat is returning in, as Kara was fired from CatCo and now only seems to be working at the DEO.

Return: Tyler Hoechlin as Clark Kent/Superman

Tyler Hoechlin, who debuted as Superman in the first two episodes of Supergirl season 2, will be returning for the season finale, reports E! News.

In the first two episodes of the season, Kara and Clark had a chance to bond and work together as superheroes. There was also some conflict between Clark and J’onn, as Clark refused to work with the DEO because the organization was holding onto stores of Kryptonite. J’onn eventually agreed to turn the stores over to Clark so they would not fall into the wrong hands.

Clark also left National City in Kara’s hands, recognizing her as a hero in her own right but leaving the door open to return at any time.

After Hoechlin’s first appearance, Kreisberg said, “We’re thrilled with working Tyler, which has been an amazing experience. We just selfishly hope we get to do it again because it really added to the show in a way.”

Considering the scope of the threat Rhea presents to the Earth, it doesn’t seem shocking to see Superman returning to help with the final conflict.

Casting: Mark Gibbon as General Zod

Kneel before Zod! Supergirl has cast veteran genre actor Mark Gibbon as General Zod, reports Bleeding Cool. He was spotted on set in Vancouver filming scenes.

The introduction of Zod could explain Superman’s presence in the finale, as he is one of Superman’s enemies in the DC Comics. Zod is a former Kryptonian general who was exiled to the Phantom Zone for treason. After escaping the Phantom Zone, he swore revenge on Kal-El.

Considering Kara’s mother’s position as a judge on Krypton, though, it would not be surprising to learn that she was the one to sentence him to the Phantom Zone, causing Zod to seek revenge on Kara, much like the Fort Rozz inhabitants of season 1.

The Supergirl season 2 finale airs Monday, May 22 at 8:00 p.m. ET on The CW.