Improve battery life

8