some changes for production