Modify part of using environment-vals