Re: changes in the infrastructure