updates after PR review