Just days after automakers and federal regulators reached a deal that would make forward-collision warning and automatic emergency braking standard in vehicles by 2022, Toyota says it’ll do one better — make these safety features standard years ahead of schedule.

The carmaker announced Monday that Toyota Safety Sense and the Lexus Safety System + packages will come standard on almost every new vehicle by the end of 2017.

In all, Toyota says the packages, which are already offered as an option on several of its Lexus and Toyota vehicles, will be standard on 25 of 30 models by 2017.

“At Toyota, we are committed to creating better ways to move for everyone,” Jim Lentz, CEO of Toyota Motor North America, said in a statement. “We are proud to help lead this industry in standardizing these systems and bring automated braking to our customers sooner rather than later.”