changed to enviro variables