Updated chat-demo