Updated all batteries to new design