Modify to the new environment