Advanced System Repair