Keep us posted about the X2R - I’d like to get mine operational again with lighted tailcap, without the NMM problem.