Address Jeff's comments