updated the message handlers to support the new code