It’s previously been reported that Tony Gilroy was heavily involved with Rogue One: A Star Wars Story’s reshoots, with various outlets claiming that he may have taken over directing duties from Gareth Edwards and is an uncredited writer on the highly anticipated spinoff.

Now, The Hollywood Reporter reveals that Gilroy “has been empowered to take the lead on post production.” Edwards reportedly remains involved, but after five weeks of extensive reshoots, he’s now supervising the final cut of Rogue One. It’s mentioned that the whole thing is very much a collaborative effort as the Gilroy played a similar role with Godzilla.

Those reshoots apparently tackled a number of issues Rogue One had, including the movie’s ending. How Edwards must feel about this is hard to say, but he still appeared at Star Wars Celebration last month to promote the movie and hasn’t exactly been fired from the project.

“There are not two separate editing rooms; they are all in there with their ideas,” says one source close to the production. “Tony’s a strong force, but they’re all working together.”

It’s going to be interesting seeing how Rogue One: A Star Wars Story performs critically and commercially this December, especially after all of these apparent behind the scenes issues.