Rearrange install steps again