addressed Yi's comments