Changes for heroku upload