Changing some things to make it work on heroku