Streamlight makes the Streamlight HL-5X
Takes the same USB on battery charging.
But adding a couple of small magnets as spacers lets flat top 16850s work just fine.
Did a review a while ago.
On Cop TV shows I still see multi D cell Maglites. Still the king of the El-Ka-bong.
All the Best, Jeff