Tesla is close to rolling out its next Autopilot software update. Included in the “Enhanced Autopilot” update are some old features that have been optimized for the latest self-driving hardware included in the Model S and Model X. Among those features are collision warning/avoidance, departure warning, and emergency braking.

On Twitter, CEO Elon Musk said the company “might be ready to roll out most of Autopilot functionality” by the end of next week.

Data needed to be collected from millions of real-world driving miles to “calibrate” the system. Tesla plans to further upgrade Autopilot on a monthly basis next year.