Simpler and mor ereadable rebuild method