modified everything for production mode