If you are still looking the Astrolux s41 will take the 18350 or the 16340. Here is a link. it is a quad nichia light. https://www.amazon.com/Astrolux-Flashlight-Flashlights-Travelling-Batteries/dp/B01LX8MJU0/ref=sr_1_1?ie=UTF8&qid=1500605715&sr=8-1&keywords=astrolux+s41