fix and reorging