Noah Kuttler aka The Calculator hasn't left the building just yet.

According to a new report, Tom Amandes, who plays the part of Kuttler is set to return for a couple more episodes of Season 4 of Arrow.

TVLine reported that the actor will be making a few more appearances but didn't get into the nature of return, will it be to support his daughter Felicity (Emily Bett Rickards) in her great hour of need or to create trouble again.

In recent news of other guest stars, it has been revealed that Madison McLaughlin is set to play a role in the next episode of the series, but little is known about her role so far. Some speculate that she might be playing the new black canary.

After Laurel's (Katie Cassidy) death, the upcoming episodes of Arrow are sure to be intense. In a recent interview, showrunners Marc Guggenheim and Wendy Mericle revealed that the episodes up ahead will be "devastating."

Speaking to TVLine Mericle revealed that the Laurel's death will have a "huge and significant" impact on team Arrow.

"The episodes [coming up]... they're devastating, and they're meant to be. We wanted to have everybody feel the impact of this loss because it is a game changer. Big moves like this force our characters to rethink their decisions and their objectives," she added.

Guggenheim also addressed the speculation about a new black canary speaking to TVLine. "We'll play with that notion in Episode 19," he said. That said, "I don't know if I'd say [the Canary mantle] is up for grabs."

Here's the official synopsis for the next episode, 'Canary Cry':

"Oliver and the team struggle to come to terms with Laurel's death, especially Diggle who is overwhelmed with guilt for choosing to believe Andy had changed. Meanwhile, Lance refuses to believe his daughter is really gone and asks Nyssa to help bring her back. A recent Black Canary sighting in Star City only seems to prove his theory that Laurel isn't actually dead."

"Canary Cry" is set to air on April 27.

Watch the preview: