Changes suggested in CR.