Bring in Jon's chat history changes