More comments, reordering.