Reorganized enviroment