I've moved to hub dynamos, just got a new wheel for my Brompton , with a Shimano hub , & B&M head and taillights.

3rd bike.. built a new wheel for my WTR, the Bi Fri was someone else's BTO came with disc brake dyno-hub..


though my 2, battery powered niterider 6v halogen headlights are still working, the 2 bulb 12v one ran out of NiCad recharge cycles,
on both the water-bottle batteries.. havent made the labor /cost jump to a different 12v. as the newer Dynamo serves so well

& 25 years on, My needs got more modest.