Tank 007 TK737

Does anyone know where I can find a Tank007 TK737/Vizeri VZ230 that isn’t glued together, and with a glass lens? I found this one that supposedly has a glass lense, but not sure if it can be taken apart easily.

How about just a glass lense that is known to fit and work well?

I really like this light, and it seems to be a good candidate for a better driver (and maybe a de-domed XP-G2)…but mine is locked up solid. Also, I don’t think the cheap plastic lens could hold up to more heat.