Update to work with heroku