tweaked how messages are passed to display