sync more with dave's comments