We are still waiting for that day when we have a battery...
We are still waiting for that day when we have a battery that has more capacity than it has right now.
We are still waiting for that day when we have a battery that has more capacity than it has right now.