Latest changes before push to heroku