* modification according to code review.