Some changes to chat system