Added some more message passing