Added more CR changes