Added changes for heroku app