Update to current data, add more comments.