The Following executive producer/co-showrunner Alexi Hawley has joined ABC veteran drama Castle as an executive producer for Season 8. He will share co-showrunner duties with Terence Paul Winter, who was named showrunner yesterday, a day after Castle was officially renewed for next season.

Hawley had been on ABC’s radar for Castle but he didn’t become available until Fox officially cancelled The Following yesterday. This marks Hawley’s return to Castle where he got his break as a writer, getting his first producer credit. Before his stint on the Kevin Williamson thriller The Following, CAA-repped Hawley created NBC’s State of Affairs.

Hawley and Winter succeed David Amann, who recently stepped down as Castle showrunner. The series star, Nathan Fillion, is set to come back. Still up in the air is the return of co-star Stana Katic, who has not yet reached an agreement for a new contract.