I’d be a little sad to see those scenes in a Prequels go only because I’m a big fan of the book Catalyst, which does a good job of tying them together with Rogue One. What about altering the plans in AOTC:R to look more like the ANH plans, something like this:
