Not sure if this has been discussed already but what do you think of removing Rey handing the lightsaber back to Leia and then having it given back to her moments later?
https://drive.google.com/file/d/1WI5MgXp_ayq4eMzTHMtBxsQqtPI6tRmQ/view?usp=sharing