Reordering working, crashing fixed