Changes so as to push to heroku