The Hollywood Reporter has another name to add to the list of creatives working on the upcoming extensive Rogue One: A Star Wars Story reshoots.

Veteran stunt coordinator and second unit director Simon Crane has been tapped to assist with the lengthy reshoots for Rogue One: A Star Wars Story, sources tell The Hollywood Reporter.

THR says that they’ve heard there are several goals of these reshoots and that one of them is lightening the “war movie” tone of the film to make it appealing to a broader audience. Sounds like we may be getting some of that classic Star Wars comedy added in. Crane’s extensive knowledge in stunt coordinating as well as his second unit directing experience makes it sound like Director Gareth Edwards will have plenty of help during that long weeks of reshoots this summer.

Additionally THR has confirmed reports that writer Tony Gilroy was also brought on in what we presume is the same role that Christopher McQuarrie was originally reported to be taking on.

In addition, THR has confirmed that Gilroy, a screenwriter whose credits range from asteroid blockbuster Armageddon to three Jason Bourne movies and the Oscar-nominated Michael Clayton, is working on the new pages for the script. Gilroy, like Crane, has a relationship with producer Frank Marshall, husband of Lucasfilm president Kathleen Kennedy.

Rogue One: A Star Wars Story is still scheduled to hit theaters on December 16th, 2016.