better crs support