Modifications in order to deploy to heroku