Updated to use the new messaging system in vamos