According to Making Star Wars (a definitive source for updates concerning the modern films), the Rogue One crew estimates that they are reshooting roughly 40 percent of the movie. They will be working six days a week for a period of eight weeks, and 32 sets have been built for this phase of the production. It was always expected there would be reshoots, it’s just that they now might be more substantial than originally thought.

EW spoke with “high level sources” at Lucasfilm to try to gain an understanding of what’s happening with Rogue One. As one might expect, their version of the story should put the most worried minds at ease. The reshoots were always part of the plan and originally scheduled for the spring before being pushed back to summer. Contrary to the rumors that the shooting period will last eight weeks, EW is claiming that director Gareth Edwards and crew will be working for four or five weeks, and finish a few days before Star Wars Celebration 2016 in London.

One of the more troubling reports about Rogue One was that the team was going to reshoot around 40 percent of the final product, which is a sizable portion of a movie. Thankfully, that figure seems to have been greatly exaggerated. One source said, “The changes have everything to do with clarity and character development and all take place [as inserts] within scenes we’ve already shot.” The goal is to have the picture locked in August, which would not be the case if they had to redo so much of the film. Where it stands now, most of the new scenes constitutes of “a lot of talking in cockpits,” and Rogue One remains on track for its December 2016 premiere.