After CR changes