Address Kevin's comments