Too many comments are generated on the PR, it would be nice to just update the last one 