changing messaging implementation