In the course of design work, parts and assemblies are constantly being updated. At one point or another, we have all made changes to a part or subassembly that has caused references to break. There are a few best practices that help when updating your designs, and there are some newer tools that assist in quickly and accurately update our designs. In my days in industry, updating mate references on our larger assemblies took almost 20 percent of my working hours. Thanks to these best practices, and especially the new "Auto-repair Mates" function, we have the ability to prevent or at least almost entirely reduce the amount of time it would take me now to perform the same tasks. In this session, I will show you what these best practices and commands are, and hopefully blow your mind with how much time you can save.