Changes to Make it work in Heroku