revised for mark's comments