Moved info to the message instead of a file