Final code running on Heroku