Hey Bob, I see you got this 18V Ryobi drill..... I have the same one, I also got a lot of their other 18v tools.... Have you tried their newer batteries?? Just a few months ago they had a special on their drill/impact combo with two lithiumIon batteries and charger.... The old tools work with the new batteries - 100% compatible, good job Ryobi !!!
These new batteries are awesome, waaay better than the 'old style' batteries .... Give it a try , you won't regret it !!!