Update to system messages based on Ryan's edits