Yep I agree, this is exactly what I meant 😃 And with the removal of 3PO awkward line from restructured v1 (“I don’t think R2 has the rest of the map”) it could work better now.
In the new context you need that line to make sense of what’s going on. Otherwise it’s not clear why R2 partially powers up.