[jess] Adding changes from heroku