changes for message passing