further non CR changes