modified files to use env