Editing to work on heroku