Merged crs stuff