Tesla announced a few software updates it’s planning for its electric vehicles on Thursday, including one where the car tracks its distance from charging stations to try to alleviate driver anxiety about running out of juice. CEO Elon Musk said that the company could push another update — autopilot — to its Model S fleet as soon as June.

While Musk said cars would be technically capable of getting from place to place without a driver having to do anything, initially this feature limited to use on highways, as neighborhoods pose safety issues given their many obstacles and variables. Eventually, drivers could also summon their cars or let the vehicles park themselves.

Mike Wall, an auto analyst at IHS, says this move echoes steps taken by other car companies and that driver-less technology is advancing faster than regulations that will govern its use.

Michelle Krebs, an analyst with AutoTrader, says driverless cars could be on the road tomorrow, but manufacturers are holding back because of regulatory concerns and questions about who’s to blame if there’s an accident. Tesla believes its autopilot feature meets current regulations.