More changes to chat