added some modifications for production