Adapted to heroku