The eighth and final season of Arrow is set to bring back a couple of familiar faces, as Colin Donnell and Josh Segarra will be making return appearances.

Donnell played Oliver’s best friend Tommy Merlyn in the first season of Arrow, and has returned many times over, often as a voice of reason when the vigilante is facing troubling times. Segarra starred as Season 5’s big bad Adrian Chase/Prometheus – a role which Donnell’s character also took on in the Crisis on Earth-X event.

However, fans shouldn’t expect their return to be without a twist, as showrunner Beth Schwartz told Entertainment Weekly, “Adrian Chase comes back in a different way than expected. We’re really excited about that because obviously he’s one of our favorite [sic] villains.”

Meanwhile, executive producer Marc Guggenheim said that Donnell is “not coming back as the Tommy we know.”

The official Season 8 logline reads, “Oliver will find himself pit against his most challenging battle yet, one that will leave the multiverse hanging in the balance. In Arrow’s final season, Oliver Queen is forced to confront the reality of what it means to be a hero.”

Arrow returns for its final season on October 15th.