changed env vars to be env specific