Elon Musk has just revealed the second part of his Master Plan. Tesla expands into electric trucks and buses, car sharing, self-driving technology and solar energy systems.

Tesla Motors Inc Chief Executive unveiled the new and updated version of the “top secret” Tesla Master Plan in a post on a company’s website on Wednesday.

His plan for the future of the company comes ten years after he published the first part in a blog post. In August 2006, in the original “Secret Tesla Motors Master Plan” Musk set out to start manufacturing electric sports cars and by using the profits from its sales to build “a wide range of models” even more affordable and then deploy infrastructure to power them with carbon-free electricity.

Tesla has achieved most of its goals and released the Roadster, Model S, Model X, then spread its super charger stations and built the Gigafactory battery plant. Only a month ago, Elon Musk announced that Tesla offered to buy the solar panel installer Solar City, which is another company he founded. He said a combined company could provide consumers with the tools for a largely carbon-free lifestyle. The electric cars would be recharged with electricity stored in home using battery packs from Gigafactory or generated by SolarCity solar panels.

In “Master Plan, Part Deux” Musk restates his argument that Tesla should acquire SolarCity Corp where he is a major shareholder.  He also aims to make Tesla Autopilot self-driving system ten times safer than manual. Musk is planning to build a full range of electric vehicles, from a pickup track and a compact SUV to public transport bus. All future Tesla vehicles, including trucks and buses, will be fully autonomous as soon as regulators and technology permits. The new vehicles will be unveiled next year. In addition, Tesla is planning to operate its own fleet of cars in some cities and will become direct competitor to companies like Uber or Lift.

The plan did not reveal when fully autonomous Tesla vehicles would be ready, but Musk noted that it could need five years of additional testing.