Alexis (Molly Quinn) and Castle (Nathan Fillion) have been going through a rough patch recently. She continues to live with Pi and Castle continues to disapprove. She also told her father she was upset that he didn’t tell her about his engagement with Beckett right away. However, tonight’s episode could be just what they need.

According to the “Castle” page on ABC.com, Alexis is going to team up with her father to try to prove a death row inmate named Frank Henson, innocent just three days before his scheduled execution.

This is the episode in which Joelle Carter, who plays Ava Crowder, guest stars as the inmate’s girlfriend who has continued to believe his innocence. (James Carpinello will play Frank Henson).

Stana Katic, who plays Beckett, said Alexis and Castle will eventually have to hash out their issues between each other. However, show boss Andrew Marlowe said Alexis and Katic’s character will have a conversation.

“I think both girls are polite, so I don’t think fans should expect a yelling match,” he recently told the Entertainment Weekly website. “We don’t like to go soap here — “You stole my father!” “You’re being immature!” I think we present a more sophisticated version that’s, hopefully, just as satisfying and moving.”

In a separate interview with TVLine.com, Marlowe had to address a rumor that he and Miller had planned out an “organic” ending to the series that would come at the end of Season

“I never declared Season 7 as the final season,” the show boss explained. “What I said is that there’s an organic ending in the show and the characters will tell me when that is.

He added the series could “take 10 to 12 years if everybody wants to.”

In a separate interview with TVLine.com Marlowe also had to address fans who recently heard of a very coveted deleted scene. According to the website, Marlowe and his wife Terri Miller showed an extended version of Castle and Beckett’s love scene at the end of Season 4 at the Austin Film Festival. They were trying to explain to those in attendance how certain scenes can be adjusted from the paper to the screen. After fans found out about the screening, many demanded to see the scene.

Marlowe commented on the incident to TVLine’s Matt Mitovich. “We were talking about how when you’re editing a show, you have an opportunity to rewrite it again and make it even stronger,” Marlowe said. “And we showed an example of a moment that we cut because it wasn’t helping the show out”.

There is hope for fans who still want to see the scene. Marlowe says it could end up on a series DVD “if there’s enough demand with the folks at ABC.”

Read the full interview with TVLine.com here.

“Castle” airs on Mondays at 10/9c on ABC.

RELATED ARTICLE: Scandal Season 3: Is Quinn Going to Get Worse?; Questions From Last Night's Episode