updated crs handling