Cygolite still offers a couple of headlights in their Expilion series that have removable li-ion battery sticks. I have had the 700 for years, and it gets very good battery life, but I also like to have the option of swapping in a fresh battery if it is ever needed. It is also an amazingly durable light, as I have put it through the ringer!