Finished the Repairing part