Extract and Repair