Added code for further review.