starting to incorporate dan's comments