A little change to message format