changed to use message.h