Made CR changes