Tweaked the environment variable setting approach