Electric car maker Tesla unveiled a 90-second battery pack swap at a demonstration in California Thursday night, CNN Money reports. The new system will allow drivers to swap out the battery in a Model S in approximately 90 seconds, which is less time than it takes to fill a car with gas at a gas station. According to Reuters, Tesla CEO Elon Musk believes that this new system will help people get over their fears about the driving range and convenience of electric cars.

Musk said that Tesla would make the battery swapping technology available to the public as early as the end of 2013, beginning in California. As Forbes describes it, Tesla’s demo was “nothing short of impressive:” an automated machine reportedly disconnected the battery, took it out of the car, and replaced it with a fully charged one, all while the driver remained in the car. At the same time, a Tesla employee was pumping gas at what Musk said was the fastest pump station in Los Angeles.

According to Bloomberg, Musk revealed a nationwide network of super-quick charging stations earlier this year. The stations are designed to charge Tesla’s cars on long-distance trips when a single charge won’t suffice. While the charging stations are free, the disadvantage is that it can take approximately 30 minutes to add 200 miles’ worth of charge to your car.

CNN Money reports that the aforementioned battery swap systems will be added to the network of quick-charging stations that Tesla is already constructing around the U.S. Though the supercharging stations are free, the battery swap service will cost $50 or more, but drivers who select this option can return to the road faster.

Will Tesla’s 90-second battery pack swap change people’s perception of electric cars? Do you need more convincing? Do you plan on purchasing a Tesla electric car? Sound off in the comments section.