Improve envitonment