Comment and reorder pieces.