change to $with_avatar