Updated Environment Stuff (untested)