Modern Key Repairing