adjust per PR review