Battery

Use these new changes