changes according to PR comment