addressed jamie's comments