Restore my portion of the work on chat handler