Addressed @chrisdembia's comments