battery added, switched some names