More efficient (untested) messaging code