changes according to review CR-DOMS-64