Minimal work on revamping chat system