EDIT PR comments 2