My 8w is an 18650 tube, using flat top batteries (efest, panny, aw, sony) and my atty's sit flush with the cap and have no gaps at all. I didn't have to sand anything. All I did was unscrew the positive pin out, screw any atty in, then screw the positive pin back in, and adjust the tiny screw for a rattle free mod.