correctly manage existing clients