reorder and comment