adapt to batteries 2 changes