changes made for heroku's sake