more messaging changes