the 8cell battery pack from allbattery.com just arrived. charging it up now with the stock MS charger. battery pack plugs right into the lighthead and battery charger, but the connector isn't tight like the stock one, so probably not as waterproof"