some changes for env