implemented feedback from demo hl-2619