Updated for Heroku deployment