Tesla CEO Elon Musk laid out his second master plan, called Part Deux, on Wednesday, which includes making smarter Tesla models that can drive itself better and self-driving electric city buses and trucks, BGR reports.

Musk says that the electric buses of the future should be smaller than the current ones, to decrease traffic congestion, with the interior of the buses redesigned to increase passenger areal density. The center aisle would be eliminated and seats would be placed where entryways are. The driver would transition to a role of fleet manager, and the bus would be able to match acceleration and braking to other vehicles to further improve the traffic flow. For the full story, click here.