changed to ExpandEnvironmentVariables