updating to be heroku-friendly