Changes so it works on Heroku