Reordered a couple options