Updated with new message
Works with new hubo messages