Address dreid's comments