Made modifications for production.