Battery fixes final try