EDIT PR comments 3