Yeah I got a reply from Matomart. I'll see if they can send me a new set of tail lights at least since the ones that came with the tank don't work lol... I'm gonna just order a new battery as I should think a 2000mah battery should last more than 5 or 10 minutes. Never liked NiCd batteries anyway.