added back in message pipeline code