After the initial 2.1 leak, I installed the HTC Battery widget, and it didn't seem to be a battery killer on my phone. I moved to the second leak yesterday, and downloaded the widget from the market, and I noticed a considerable difference in battery drain. Then, this morning when the "Get more HTC widgets" option was live, it prompted me for an update for the battery widget.....still a noted increase in battery drain. This may be useless info to you, sorry if i was narrating.