Change to look in envvars