Added changes for for heroku app