Updated to handle ChatMark3 changes