made the modification according to the pull discussion