Feature/battery life