Updated for the production environment