rework how env variables work