updated after Tim's comments