Bring back ownerships for battery
update from jb422