Changes for pushing to heroku