Setup changes for beta1