I know everyone raves about their magic shines, but in recent years with the advances in LED lights and USB charging batteries the concept of a separate battery pack and the issues you face are just a non starter for me. I have two ridiculously good self contained lights, a cygolite and a nite rider, I have extra mounts on all my bikes and helmet. It's just a no brainer, which is totally appropriate for me