Fixed up primary and reordering