incorporating Ed's comments