changes from a pull req