Heroku friendly 2