changes according to review CR-NEWSPAPER-231