More CRS work