Updated with your comments.