Update to use Chat#finish method