Made it more heroku friendly