change to incorporate simple messages