EDIT PR comments 4