I had two problems: spilled water in my keyboard, and my battery was old.
First I bought a new uppercase, a new battery and tools. The package arrived in Brazil very fast.
I followed the tutorial with only one problem: I broke the battery indicator plug. Fortunately, there was a new entire cable in the new uppercase, so that was not a big deal.
Be patient ;)