updated on review comments

updated on review comments