Battery Bar: Re-work