Apple on Tuesday announced that its Self Service Repair program will be expanded to include the current iPhone 14 lineup and M2 Macs. The company also changed its iPhone System Configurator process, and in some countries added new components that can be self-repaired.

Starting on June 21, each iPhone 14 model, the M2 13-inch MacBook Air, the M2 Pro MacBook Pro, and the M2 Max MacBook Pro are part of the Self Service Repair program. Anyone wanting to repair these devices can use the same parts, tools, and manuals the Apple Store locations and Authorized Service Providers use. These items are available at the Self Service Repair Store.

In Belgium, France, Germany, Italy, Poland, Spain, Sweden, the U.K., and the U.S., Apple added Self Service Repair for desktop M1 Macs, and the True Depth camera and top speaker on the iPhone 12 and iPhone 13 lineups.

A major part of the self-repair process is System Configurator, an app that, according to Apple, “ensures repairs with genuine Apple parts–designed and tested to internationally recognized standards–were completed correctly, and the parts are working properly.” Apple will now no longer require users to contact the Self Service Repair support to finalize a repair in System Configurator.

Apple launched the Self Service Repair program last year, in what seemed to be a response to pressure from the Right to Repair campaign. Customers can read the appropriate manual to check the difficulty of a repair–in some instances, tool kits will need to be rented, in addition to buying parts. The repairs all require a certain level of mechanical aptitude as well as a good amount of patience, but its a good way to fix a device that otherwise has a lot of life left in it.