Now uses partial repairing mechanism