folded in latest commits from heroku app