Re: later rebuild for new architecture