fixed battery
fixed battery
merged