Step 6: Repair + Replace