Updated for deployment to Heroku