Updated for heroku deployment