Addressed @jeffmo's comments on #70