Updated. We need to verify how messages are connected