use env at more places