Update to Safe Environment