edits for heroku compatibility