Step 2: Target & Repair