reorder and fix