incorporating Dave's critique