Repair and Reengineer