Updated for battery indicator