Changes to fit heroku