updates to messaging. tested with test app