test2
new version, plus message.h