Change the way we set the env