More changes to env2