Make start on new reordering/ fixing