actually use new env vars...duh