Elon Musk’s Tesla will soon include sophisticated software in its energy-efficient cars that will make them the most advanced self-driving vehicles in the market.

The company plans new updates that will allow some models to drive short distances on their own, on private property, and will offer automatic steering.

Using the “summon” feature, cars will be able to find their drivers; or put themselves back in the garage – even closing the garage door.

It is this autonomous driving feature that will make the Tesla vehicles the most advanced on the market, pipping competitors Google and Mercedes Benz, which have both been working on their own solutions.

The Tesla 7.0 software upgrade will be available within the next three months.

An interim software update, version 6.2, will include automatic emergency braking and blind spot warnings as well as maps that constantly track superchargers within range of the car’s energy level, and will warn drivers if they are in danger of moving outside of charger range.