revisions from jeff's comments