Version with stuff added for Heroku, which it does not seem to recognize