Address adam's comments