implemented feedback from cvrebert & mdo