updating to use ENV variables