more work on crs adapter