added the message capability too