Modified for correct start on Heroku