We are now offering a 18350 cell "short" body upgrade package that will allow you to upgrade your Surefire® M600DF light and keep all the output.