env variables rejig