Updated changes for production.