Following up on the comments to the PR