I'd heard that Princeton Tec was going to modify the battery contact in the bottom of the Tec 40 with springs so it would work better with batteries that have a shorter negative end. I've been looking for the new lights for a while now and haven't seen them so I called Princeton Tec today to see when they will start shipping the Tec 40s with the new contacts. They told me that they had planned to modify the battery contact but have decided not to do it now. So unfortunately it looks like there will be no change. I was hoping to get one with the spring contact so I could use NIMH in the light. John