rearrange and comments.