I know the aw ones have been gone a long time and no one cares for this size light anymore. But I still love the "C" cell diameter lights. Is there anyone making a decent 25500? Currently I'm using 2x18500 in an adapter but it's wasting capacity space