First attempt heroku compatibility