Machine rebuilding