Tesla Motors CEO Elon Musk announced updates to the Model S electric sedan that it says will end “range anxiety” and could lead to an early self-driving system within a matter of months.

Musk said that Tesla’s version 6.2 software, which the company will release later this month to all Tesla Model S sedans now on the road, won’t actually improve the vehicle’s range. Instead, it will “give drivers peace of mind.”

The new Range Assurance feature will tell drivers how far they are from a Tesla supercharger station, discarding chargers that are already in heavy use. It will also warn drivers when they stray too far out of range. “It will be impossible to run out of charge unless you do so intentionally,” Elon Musk said.

“You’ll have to say, ‘Yes, I’m sure — twice,’” he added. The car’s software will also analyze and plan your route for long-distance travel, factoring in proximity to superchargers. The update will also come to Tesla’s upcoming Model X SUV, due out later this year.

Tesla Motors plans to introduce automated steering capability within three months, CEO Elon Musk said during a press conference this morning.

Musk said the technology will allow drivers to take their hands off the steering wheel on major roads and highways, and at low speeds on private property.