organize and still profiling, there is a mem leak in doRepair()