updated with env variables