Final update before push to heroku