more CR changes