Chat controller changes brought in from CK