Re: trying to avoid rebuilding whole system