make the modification according to comment