But EW’s reporting has uncovered a new collaborator on Rogue One: Tony Gilroy, the writer-director of Michael Clayton. He was brought aboard the project in the spring to offer notes on the first cut and write some additional material to enhance the story.

Gilroy has deep ties to the Rogue One team. He also worked on the screenplays for many of the Bourne films and even directed 2012’s The Bourne Legacy, which were all produced by Frank Marshall, the husband of Kathleen Kennedy, who is the president of Lucasfilm. One source says Gilroy’s trusted by Kennedy and the story team, and has even been recruited to consult on other Star Wars projects.

In addition to his Kennedy-Marshall history, Gilroy has worked before with Rogue One director Edwards, having done similar uncredited work on the filmmaker’s previous movie, 2014’s Godzilla, to strengthen the story before release.

In addition to writing new dialogue for the reshoots, Gilroy will assist Edwards as a second unit director when cameras start rolling again.