CR changes applied