added check for environmantal variables as well
merge conflicts