Trying to adapt to heroku