Just moving the logic of the battery around. Not sure if this will fix anything.