Working rebuild method