2nd half of CR changes