battery and pumped hydro storage