I made some changes, Please review.