new branch with chat-module only