update based on comments on #8180