better battery handling