synching up from heroku build