final version before heroku push