Added name file to messages
Updated based on new instructions