Made changes for Heroku