The light came with a cradle for two 123's. Wouldnt be too hard to mod it to accept a common 18650. You'd lose the in-body charging, but it may be an option if a rechargeable 18650 is preferred, or the proprietary cell is no longer produced (and I dont think it is, though SF may still have some).