updated to new env variables