Updated conversation checking