made some more changes for production