Well then you’re very welcome 😃

JEDIT: I’ll just leave this idea here to come back to later, since there’s edit specific stuff to do right now:

As it is presented in the film, R2 has been in low power mode ‘since Luke went away’. BB-8 suggests that the map to Luke could be in R2’s backup data, and at the end of the film C-3PO says ‘you’ve found what?’, indicating that R2 has been searching his backup files in low power mode since Luke went away. The problem of course is that it is awfully convenient that he just happens to finish his search when everyone needs a morale boost at the end of the film. The idea that the presence of Rey unlocked the data also strains credulity, in my opinion.

So, my idea is to have R2 awaken some moments after BB-8 hits him but after the others are gone, using the beginning of the shot where his lights come on. He has overheard BB-8’s comment about his backup data, something he had not considered. He then starts to comb through his data, perhaps using a new sound and a flashing light on his body, much like the light of a hard drive reading data. Then, at the end of the film, he can complete his search and announce his discovery as usual.