Added battery and  more things