changed message format again
merge?