Changes for CWR comments