Updated to work on the event message protocol style.