updated with env variables case