Finishing the improvement of the chat