made changes for production mode