port to new message format