integrate CR comments