moving the user specific stuff back into env variables