Updated for heroku installation