By the way are you going to address the issue that a weakness is known by Jyn to have been implemented by her father ? It’s totally inconsistent with ANH so I was wondering if you were going to remove it. And since the main focus of your edit is the battle of Scarif are you going to use a flash back structure to keep at least the dialogue between Donnie Yen character and Jyn about the kyber crystals and the Whills ? (could be cool to find a way to somehow keep that small interesting part)