With “Castle” on the bubble, fans are anxiously awaiting a renewal. Variety has learned that the ABC drama has yet to be handed an eighth season — however, if it does return, Nathan Fillion is set to come back.

But what about Stana Katic?

A spokesperson for ABC tells Variety that while Fillion’s deal is done, Katic has yet to sign a new contract for a new season. Both leads’ existing contracts are up at the end of this season, which is still a solid performer for the network.

“Castle” will also see a showrunner shift, in the event that the procedural is renewed for the 2015-16 season, which seems likely now that Fillion is locked in.

ABC confirmed David Amann will exit the crime drama, and the search for a new showrunner is on.

Sources tell Variety that series creator Andrew Marlowe will also step away. Marlowe passed down the showrunner title to Amann at the end of Season 6, but has been actively attached to Season 7, serving as an exec producer.