Added the changes requested in the review meeting.