edited references to env variables