I used to use my 18650 tube in the ZNA but its just so much more comfortable in 18490 mode. I'd rather just change out batteries every other hour or so.
I'm going to CIEC this weekend, if any of you guys want an upgraded top cap and don't want to wait, PM me. There like $30 (or maybe there $28...