first revision, comments inline