Adapted for rideshare and heroku