* second modification according to code review.