I'm seriously considering keeping the headlight set-up "as-is" because it works so good, and it's easy to just replace the battery when needed. (haven't had to even with the Super bright 9V SMD bulb) But, I am leaning towards using the little LiPo pack to run the tail/brake light tho. (I'm eliminating the turn-signals in order to get rid of the ugly little control box on the handle bars, and go to a more basic, era look) Added advantage is it has a on/off switch built in right into to the battery pack, and it's small enough to mount where ever. Ideally, up front of the engine, where low oil pressure sensors located.