add a few changes from Bob